From 95ec68f59f8c6290ca24e446db6365c67cecbb5c Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 23 Jan 2024 17:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=AA=E5=99=A8=E4=BB=8B=E7=BB=8D=E4=BF=A1=E6=81=AF=E3=80=81?=
 =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=A4=E7=90=86=E4=BF=A1=E6=81=AF=E3=80=81?=
 =?UTF-8?q?=E4=BB=AA=E5=99=A8=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...y.java => InstrumentFileClassifyEnum.java} |  4 ++--
 .../mapper/WxInstrumentFileRelateMapper.xml   |  1 +
 .../mapper/WxInstrumentModeMapper.xml         |  2 +-
 .../controller/WxInstrumentController.java    | 22 +++++++++++++++++
 .../service/IWxInstrumentService.java         |  5 ++++
 .../service/impl/WxInstrumentServiceImpl.java | 24 +++++++++++++++++++
 .../service/impl/WxInstrumentServiceImpl.java | 18 +++++++-------
 7 files changed, 64 insertions(+), 12 deletions(-)
 rename flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/{InstrumentFileClassify.java => InstrumentFileClassifyEnum.java} (82%)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassifyEnum.java
similarity index 82%
rename from flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java
rename to flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassifyEnum.java
index f030c06..21fd494 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassify.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/InstrumentFileClassifyEnum.java
@@ -6,13 +6,13 @@ package com.flossom.common.core.enums;
  *
  * @author flossom
  */
-public enum InstrumentFileClassify {
+public enum InstrumentFileClassifyEnum {
     FIRST_NURSE(1, "初次护理"), INSTRUMENT_INSTRUCTION(2, "仪器介绍");
 
     private final Integer code;
     private final String info;
 
-    InstrumentFileClassify(Integer code, String info) {
+    InstrumentFileClassifyEnum(Integer code, String info) {
         this.code = code;
         this.info = info;
     }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml
index b045634..0dcb0b8 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentFileRelateMapper.xml
@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="message != null  and message != ''"> and message = #{message}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectWxInstrumentFileRelateById" parameterType="Long" resultMap="WxInstrumentFileRelateResult">
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml
index e58feb7..8fe99b8 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNew != null "> and is_new = #{isNew}</if>
             <if test="status != null "> and status = #{status}</if>
         </where>
-        order by mode_sort
+        order by mode_sort asc
     </select>
     
     <select id="selectWxInstrumentModeById" parameterType="Long" resultMap="WxInstrumentModeResult">
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 fa57dc3..9f8c36b 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
@@ -3,6 +3,7 @@ package com.flossom.miniProgram.controller;
 import com.flossom.common.core.constant.Constants;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.SysFile;
+import com.flossom.common.core.enums.InstrumentFileClassifyEnum;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.miniProgram.service.IWxInstrumentService;
@@ -95,7 +96,28 @@ public class WxInstrumentController extends BaseController {
         return R.ok(wxInstrumentService.getInstrumentInfoBySerial(serial));
     }
 
+    /**
+     * 根据仪器ID获取仪器介绍信息
+     */
+    @GetMapping(value = "/instructionInfo")
+    public R instructionInfo(@NotNull(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) {
+        return R.ok(wxInstrumentService.getInstrumentFileRelateByInstrumentId(instrumentId, InstrumentFileClassifyEnum.INSTRUMENT_INSTRUCTION.getCode()));
+    }
 
+    /**
+     * 根据仪器ID获取仪器的初次护理信息
+     */
+    @GetMapping(value = "/firstNurseInfo")
+    public R getInfoByInstrumentId(@NotNull(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) {
+        return R.ok(wxInstrumentService.getInstrumentFileRelateByInstrumentId(instrumentId, InstrumentFileClassifyEnum.FIRST_NURSE.getCode()));
+    }
 
+    /**
+     * 根据仪器ID获取仪器模式
+     */
+    @GetMapping(value = "/modeInfo")
+    public R modeInfo(@NotNull(message = "仪器ID不能为空") @RequestParam("instrumentId") Long instrumentId) {
+        return R.ok(wxInstrumentService.getInstrumentModeByInstrumentId(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 c12514d..b463097 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
@@ -1,6 +1,8 @@
 package com.flossom.miniProgram.service;
 
 import com.flossom.common.core.domain.entity.WxInstrument;
+import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
+import com.flossom.common.core.domain.entity.WxInstrumentMode;
 import com.flossom.common.core.domain.entity.WxInstrumentSerial;
 
 import java.util.List;
@@ -22,4 +24,7 @@ public interface IWxInstrumentService {
 
     List<WxInstrument>  unbindingInstrumentInfoList();
 
+    List<WxInstrumentFileRelate> getInstrumentFileRelateByInstrumentId(Long instrumentId, Integer classify);
+
+    List<WxInstrumentMode> getInstrumentModeByInstrumentId(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 11e9d74..2034131 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
@@ -2,6 +2,7 @@ package com.flossom.miniProgram.service.impl;
 
 import com.flossom.common.core.domain.entity.*;
 import com.flossom.common.core.enums.BindingStatusEnums;
+import com.flossom.common.core.enums.InstrumentFileClassifyEnum;
 import com.flossom.common.core.enums.SerialValidStatusEnums;
 import com.flossom.common.core.enums.Status;
 import com.flossom.common.core.exception.ServiceException;
@@ -46,6 +47,12 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxUserInstrumentLogMapper wxUserInstrumentLogMapper;
 
+    @Autowired
+    private WxInstrumentFileRelateMapper wxInstrumentFileRelateMapper;
+
+    @Autowired
+    private WxInstrumentModeMapper wxInstrumentModeMapper;
+
     @Override
     public List<WxInstrument> bindingInstrumentList() {
         return wxInstrumentMapper.selectBindingInstrumentListByUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
@@ -262,4 +269,21 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         newUserInstrumentLog.setCreateTime(DateUtils.getNowDate());
         wxUserInstrumentLogMapper.insertWxUserInstrumentLog(newUserInstrumentLog);
     }
+
+    @Override
+    public List<WxInstrumentFileRelate> getInstrumentFileRelateByInstrumentId(Long instrumentId, Integer classify) {
+        WxInstrumentFileRelate wxInstrumentFileRelate = new WxInstrumentFileRelate();
+        wxInstrumentFileRelate.setInstrumentId(instrumentId);
+        wxInstrumentFileRelate.setClassify(classify);
+        wxInstrumentFileRelate.setStatus(Status.OK.getCode().longValue());
+        return wxInstrumentFileRelateMapper.selectWxInstrumentFileRelateList(wxInstrumentFileRelate);
+    }
+
+    @Override
+    public List<WxInstrumentMode> getInstrumentModeByInstrumentId(Long instrumentId) {
+        WxInstrumentMode wxInstrumentMode = new WxInstrumentMode();
+        wxInstrumentMode.setInstrumentId(instrumentId);
+        wxInstrumentMode.setStatus(Status.OK.getCode());
+        return wxInstrumentModeMapper.selectWxInstrumentModeList(wxInstrumentMode);
+    }
 }
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
index 5237daf..4220795 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
@@ -11,7 +11,7 @@ import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
 import com.flossom.common.core.domain.entity.WxInstrumentMode;
 import com.flossom.common.core.domain.req.WxInstrumentReq;
 import com.flossom.common.core.domain.req.WxInstrumentSaveReq;
-import com.flossom.common.core.enums.InstrumentFileClassify;
+import com.flossom.common.core.enums.InstrumentFileClassifyEnum;
 import com.flossom.common.core.enums.Status;
 import com.flossom.common.core.mapper.SysTagMapper;
 import com.flossom.common.core.mapper.WxInstrumentFileRelateMapper;
@@ -75,11 +75,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         }
         // 获取护理弹窗关联
         List<WxInstrumentFileRelate> firstNurseRelate = wxInstrumentFileRelateMapper.
-                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassify.FIRST_NURSE.getCode());
+                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassifyEnum.FIRST_NURSE.getCode());
         wxInstrumentSaveReq.setNurseList(firstNurseRelate);
         // 获取护理弹窗关联
         List<WxInstrumentFileRelate> instructionRelate = wxInstrumentFileRelateMapper.
-                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+                selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassifyEnum.INSTRUMENT_INSTRUCTION.getCode());
         wxInstrumentSaveReq.setIntroduceList(instructionRelate);
         // 获取模式关联
         WxInstrumentMode wxInstrumentMode = new WxInstrumentMode();
@@ -160,7 +160,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                     continue;
                 }
                 next.setInstrumentId(wxInstrument.getId());
-                next.setClassify(InstrumentFileClassify.FIRST_NURSE.getCode());
+                next.setClassify(InstrumentFileClassifyEnum.FIRST_NURSE.getCode());
                 wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
             }
         }
@@ -176,7 +176,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                     continue;
                 }
                 next.setInstrumentId(wxInstrument.getId());
-                next.setClassify(InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+                next.setClassify(InstrumentFileClassifyEnum.INSTRUMENT_INSTRUCTION.getCode());
                 wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
             }
         }
@@ -257,7 +257,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         // 保存初次护理规则
         List<WxInstrumentFileRelate> nurseList = wxInstrumentSaveReq.getNurseList();
         wxInstrumentFileRelateMapper.deleteByInstrumentIdAndClassify(wxInstrumentSaveReq.getId(),
-                InstrumentFileClassify.FIRST_NURSE.getCode());
+                InstrumentFileClassifyEnum.FIRST_NURSE.getCode());
         if (nurseList != null && nurseList.size() > 0) {
             Iterator<WxInstrumentFileRelate> nurseIterator = nurseList.iterator();
             while (nurseIterator.hasNext()) {
@@ -267,14 +267,14 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                     continue;
                 }
                 next.setInstrumentId(wxInstrument.getId());
-                next.setClassify(InstrumentFileClassify.FIRST_NURSE.getCode());
+                next.setClassify(InstrumentFileClassifyEnum.FIRST_NURSE.getCode());
                 wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
             }
         }
 
         // 保存仪器介绍规则
         wxInstrumentFileRelateMapper.deleteByInstrumentIdAndClassify(wxInstrumentSaveReq.getId(),
-                InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+                InstrumentFileClassifyEnum.INSTRUMENT_INSTRUCTION.getCode());
         List<WxInstrumentFileRelate> introduceList = wxInstrumentSaveReq.getIntroduceList();
         Iterator<WxInstrumentFileRelate> introduceIterator = introduceList.iterator();
         while (introduceIterator.hasNext()) {
@@ -284,7 +284,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 continue;
             }
             next.setInstrumentId(wxInstrument.getId());
-            next.setClassify(InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
+            next.setClassify(InstrumentFileClassifyEnum.INSTRUMENT_INSTRUCTION.getCode());
             wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
         }