From 1ab8ccf114276d94c67d3fc89bdeaf254191138e Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 2 Feb 2024 15:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/WxMode.java     |  6 ++--
 .../common/core/domain/ret/WxModeRet.java     | 36 +++++++++++++++++++
 .../mapper/WxModeCombineInfoMapper.xml        |  1 +
 .../mapper/WxModeOpenSourceMapper.xml         |  1 +
 .../mapper/WxModeServiceInfoMapper.xml        |  1 +
 .../service/impl/WxInstrumentServiceImpl.java | 22 ++++++++++++
 6 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
index 7b93c79..6148dfb 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
@@ -62,7 +62,7 @@ public class WxMode extends BaseEntity
     /** 模式时长 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "模式时长", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date modeTime;
+    private Integer modeTime;
 
     /** 准备视频 */
     @Excel(name = "准备视频")
@@ -187,12 +187,12 @@ public class WxMode extends BaseEntity
     {
         return isCabinMode;
     }
-    public void setModeTime(Date modeTime)
+    public void setModeTime(Integer modeTime)
     {
         this.modeTime = modeTime;
     }
 
-    public Date getModeTime()
+    public Integer getModeTime()
     {
         return modeTime;
     }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
index 8812862..41e23ad 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
@@ -2,6 +2,9 @@ package com.flossom.common.core.domain.ret;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.domain.entity.WxModeCombineInfo;
+import com.flossom.common.core.domain.entity.WxModeOpenSource;
+import com.flossom.common.core.domain.entity.WxModeServiceInfo;
 import com.flossom.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -118,6 +121,15 @@ public class WxModeRet {
 
     private String lockCompanyTag;
 
+    // 弹出弹窗实体类
+    private List<WxModeOpenSource> openSourceData;
+
+    // 服务实体类
+    private List<WxModeServiceInfo> serviceData;
+
+    // 组合实体类
+    private List<WxModeCombineInfo> combineData;
+
 
     private List<Long> lockWechatTagArray = new ArrayList<Long>();
 
@@ -283,4 +295,28 @@ public class WxModeRet {
     public void setLock(Boolean lock) {
         isLock = lock;
     }
+
+    public List<WxModeOpenSource> getOpenSourceData() {
+        return openSourceData;
+    }
+
+    public void setOpenSourceData(List<WxModeOpenSource> openSourceData) {
+        this.openSourceData = openSourceData;
+    }
+
+    public List<WxModeServiceInfo> getServiceData() {
+        return serviceData;
+    }
+
+    public void setServiceData(List<WxModeServiceInfo> serviceData) {
+        this.serviceData = serviceData;
+    }
+
+    public List<WxModeCombineInfo> getCombineData() {
+        return combineData;
+    }
+
+    public void setCombineData(List<WxModeCombineInfo> combineData) {
+        this.combineData = combineData;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
index 19711f9..6e4c15f 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="technologyInfo != null  and technologyInfo != ''"> and technology_info = #{technologyInfo}</if>
             <if test="effectContent != null  and effectContent != ''"> and effect_content = #{effectContent}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectWxModeCombineInfoById" parameterType="Long" resultMap="WxModeCombineInfoResult">
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml
index 9e80329..ddc3553 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml
@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openSourceSuffix != null  and openSourceSuffix != ''"> and open_source_suffix = #{openSourceSuffix}</if>
             <if test="openContent != null  and openContent != ''"> and open_content = #{openContent}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectWxModeOpenSourceById" parameterType="Long" resultMap="WxModeOpenSourceResult">
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml
index d801593..9eecadb 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startSource != null  and startSource != ''"> and start_source = #{startSource}</if>
             <if test="stopSource != null  and stopSource != ''"> and stop_source = #{stopSource}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectWxModeServiceInfoById" parameterType="Long" resultMap="WxModeServiceInfoResult">
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 c9e8de1..3247b7b 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
@@ -78,6 +78,15 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxModeTagMapper wxModeTagMapper;
 
+    @Autowired
+    private WxModeOpenSourceMapper wxModeOpenSourceMapper;
+
+    @Autowired
+    private WxModeCombineInfoMapper wxModeCombineInfoMapper;
+
+    @Autowired
+    private WxModeServiceInfoMapper wxModeServiceInfoMapper;
+
     @Override
     public List<WxInstrument> bindingInstrumentList() {
         /* 绑定了的仪器 不受 "可见小程序标签/可见外部标签" 影响， 去除仪器隐藏的 */
@@ -419,6 +428,19 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             WxModeRet wxModeRet = new WxModeRet();
             BeanUtils.copyProperties(wxMode, wxModeRet);
             wxModeRet.setLock(false);
+
+            // 查询 模式组合
+            WxModeCombineInfo query = new WxModeCombineInfo();
+            query.setModeId(wxMode.getId());
+            wxModeRet.setCombineData(wxModeCombineInfoMapper.selectWxModeCombineInfoList(query));
+            // 查询 弹窗集合
+            WxModeOpenSource wxModeOpenSource = new WxModeOpenSource();
+            wxModeOpenSource.setModeId(wxMode.getId());
+            wxModeRet.setOpenSourceData(wxModeOpenSourceMapper.selectWxModeOpenSourceList(wxModeOpenSource));
+            // 查询 服务集合
+            WxModeServiceInfo wxModeServiceInfo = new WxModeServiceInfo();
+            wxModeServiceInfo.setModeId(wxMode.getId());
+            wxModeRet.setServiceData(wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo));
             wxModeRetList.add(wxModeRet);
         }
         return wxModeRetList;