From 813348c42be8a0511c25ec0e5c0be65dc46c3767 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Tue, 5 Dec 2023 13:22:36 +0800
Subject: [PATCH] fix

---
 .../common/core/domain/equip/vo/DevInfoVo.java |  1 +
 .../bonus/zlpt/equip/mapper/DevInfoMapper.java |  8 ++++++++
 .../zlpt/equip/service/IDevInfoService.java    |  8 ++++++++
 .../equip/service/impl/DevInfoServiceImpl.java | 18 ++++++++++++++++--
 .../main/resources/mapper/DevInfoMapper.xml    |  8 ++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
index ff025e4..232c088 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
@@ -21,5 +21,6 @@ public class DevInfoVo extends DevInfo {
     private String companyName;
     /* 联系商家，被授权人手机号 */
     private String authPhone;
+    private String[] pictures;
     private String keyWord;
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
index 9987bd4..c01f2c3 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
@@ -21,6 +21,14 @@ public interface DevInfoMapper
      */
     public DevInfoVo selectDevInfoByMaId(Long maId);
 
+    /**
+     * 查询设备图片集
+     *
+     * @param maId 设备信息主键
+     * @return 设备图片集
+     */
+    public String getPicturesByMaId(Long maId);
+
     /**
      * 查询设备信息列表
      * 
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
index 5ab3008..8effa1d 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
@@ -22,6 +22,14 @@ public interface IDevInfoService
      */
     public DevInfoVo selectDevInfoByMaId(Long maId);
 
+    /**
+     * 查询设备图片集
+     *
+     * @param maId 设备信息主键
+     * @return 设备图片集
+     */
+    public String getPicturesByMaId(Long maId);
+
     /**
      * 查询设备信息列表
      * 
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 5eb66af..a897190 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -38,10 +38,24 @@ public class DevInfoServiceImpl implements IDevInfoService
     @Override
     public DevInfoVo selectDevInfoByMaId(Long maId)
     {
-        return devInfoMapper.selectDevInfoByMaId(maId);
+        DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId);
+        String pictures = devInfoMapper.getPicturesByMaId(maId);
+        String[] pictureArray = pictures.split(",");
+        devInfoVo.setPictures(pictureArray);
+        return devInfoVo;
     }
 
-
+    /**
+     * 查询设备图片集
+     *
+     * @param maId 设备信息主键
+     * @return 设备图片集
+     */
+    @Override
+    public String getPicturesByMaId(Long maId)
+    {
+        return devInfoMapper.getPicturesByMaId(maId);
+    }
 
     /**
      * 查询设备信息列表
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 1c96db2..cde45f0 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -93,6 +93,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ) ty on d.type_id=ty.type_id
         where d.ma_id = #{maId}
     </select>
+
+    <select id="getPicturesByMaId" parameterType="Long" resultType="String">
+        SELECT GROUP_CONCAT(sys.file_url)
+        from ma_dev_info d
+                 left join sys_file_info sys on d.ma_id = sys.model_id
+        WHERE d.ma_id = #{maId}
+        GROUP BY d.ma_id
+    </select>
         
     <insert id="insertDevInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">
         insert into ma_dev_info