欢迎语新增小程序和媒体大小

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/qdto/SaveWelcomeMediaQDTO.java

@@ -23,6 +23,10 @@ public class SaveWelcomeMediaQDTO implements Serializable {
      * @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
      */
     private Integer mediaType;
+    /**
+     * 媒体资源大小
+     */
+    private Integer mediaSize;
 
     public String getMediaTitle() {
         return mediaTitle;
@@ -48,6 +52,14 @@ public class SaveWelcomeMediaQDTO implements Serializable {
         this.mediaType = mediaType;
     }
 
+    public Integer getMediaSize() {
+        return mediaSize;
+    }
+
+    public void setMediaSize(Integer mediaSize) {
+        this.mediaSize = mediaSize;
+    }
+
     @Override
     public String toString() {
         return "SaveWelcomeMediaQDTO{" +

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/WelcomeMediaTypeEnum.java

@@ -16,6 +16,7 @@ public enum WelcomeMediaTypeEnum implements Serializable {
     VIDEO(2, "视频"),
     FILE(3, "文件"),
     LINK(4, "链接"),
+    PROGRAM(5, "小程序"),
     ;
 
     private final Integer code;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWelcomeMedia.java

@@ -36,6 +36,10 @@ public class TabHaobanWelcomeMedia implements Serializable {
     */
     private String mediaUrl;
     /**
+     * 媒体资源大小
+     */
+    private String mediaSize;
+    /**
     * 创建时间
     */
     private Date createTime;
@@ -97,6 +101,14 @@ public class TabHaobanWelcomeMedia implements Serializable {
         this.mediaUrl = mediaUrl;
     }
 
+    public String getMediaSize() {
+        return mediaSize;
+    }
+
+    public void setMediaSize(String mediaSize) {
+        this.mediaSize = mediaSize;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/SaveWelcomeMediaBO.java

@@ -20,6 +20,10 @@ public class SaveWelcomeMediaBO {
      * @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
      */
     private Integer mediaType;
+    /**
+     * 媒体大小
+     */
+    private String mediaSize;
 
     public String getMediaTitle() {
         return mediaTitle;
@@ -45,6 +49,14 @@ public class SaveWelcomeMediaBO {
         this.mediaType = mediaType;
     }
 
+    public String getMediaSize() {
+        return mediaSize;
+    }
+
+    public void setMediaSize(String mediaSize) {
+        this.mediaSize = mediaSize;
+    }
+
     @Override
     public String toString() {
         return "SaveWelcomeMediaBO{" +

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/WelcomeMediaBO.java

@@ -24,7 +24,11 @@ public class WelcomeMediaBO {
      */
     private String mediaTitle;
     /**
-     * 媒体类型 1图片 2视频 3文件 4链接
+     * 小程序名称
+     */
+    private String miniProgramName;
+    /**
+     * 媒体类型 1图片 2视频 3文件 4链接 5小程序
      */
     private Integer mediaType;
     /**
@@ -72,6 +76,14 @@ public class WelcomeMediaBO {
         this.mediaType = mediaType;
     }
 
+    public String getMiniProgramName() {
+        return miniProgramName;
+    }
+
+    public void setMiniProgramName(String miniProgramName) {
+        this.miniProgramName = miniProgramName;
+    }
+
     public String getMediaUrl() {
         return mediaUrl;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -43,6 +43,8 @@ public class WelcomeServiceImpl implements WelcomeService {
     private TabHaobanWelcomeSuitRangMapper welcomeSuitRangMapper;
     @Autowired
     private StaffDepartmentRelatedMapper staffDepartmentRelatedMapper;
+    @Autowired
+    private TabMiniprogramSettingMapper miniprogramSettingMapper;
 
     private static final int WELCOME_LIMIT = 50;
     private static final int DEPARTMENT_NUM_LIMIT = 100;
@@ -150,6 +152,7 @@ public class WelcomeServiceImpl implements WelcomeService {
             media.setMediaTitle(one.getMediaTitle());
             media.setMediaType(one.getMediaType());
             media.setMediaUrl(one.getMediaUrl());
+            media.setMediaSize(one.getMediaSize());
             media.setCreateTime(new Date());
             media.setDeleteFlag(0);
             return media;
@@ -229,6 +232,9 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcomeDetail.setWelcomeMediaList(
                 convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId()))
         );
+        // 为媒体列表添加小程序
+        assemblyMiniProgram(welcome, welcomeDetail);
+
         // 适用部门列表
         TabHaobanWelcomeSuitRang deptRangQuery = new TabHaobanWelcomeSuitRang();
         deptRangQuery.setWxEnterpriseId(welcome.getWxEnterpriseId());
@@ -250,6 +256,23 @@ public class WelcomeServiceImpl implements WelcomeService {
         return welcomeDetail;
     }
 
+    private void assemblyMiniProgram(TabWelcome welcome, WelcomeDetailBO welcomeDetail) {
+        TabHaobanFriendSetting friendSetting = friendSettingMapper.getByWxEnterpriseId(welcome.getWxEnterpriseId());
+        if (friendSetting.getFriendSettingType().equals(1)) {
+            WelcomeMediaBO welcomeMediaBO = new WelcomeMediaBO();
+            List<TabMiniprogramSetting> tabMiniprogramSettings = miniprogramSettingMapper.listMiniprogramSetting(welcome.getWxEnterpriseId());
+            if (CollectionUtils.isNotEmpty(tabMiniprogramSettings)) {
+                TabMiniprogramSetting setting = tabMiniprogramSettings.get(0);
+                welcomeMediaBO.setWxEnterpriseId(welcome.getWxEnterpriseId());
+                welcomeMediaBO.setMediaTitle(setting.getTitle());
+                welcomeMediaBO.setMediaType(WelcomeMediaTypeEnum.PROGRAM.getCode());
+                welcomeMediaBO.setMiniProgramName(setting.getMiniprogramName());
+                welcomeMediaBO.setMediaUrl(setting.getImageUrl());
+                welcomeDetail.getWelcomeMediaList().add(welcomeMediaBO);
+            }
+        }
+    }
+
     @Override
     public Boolean saveFriendSetting(SaveFriendSettingBO bo) {
         if (Objects.isNull(bo)) {

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMediaMapper.xml

@@ -9,6 +9,7 @@
         <result property="mediaTitle" column="media_title" jdbcType="VARCHAR"/>
         <result property="mediaType" column="media_type" jdbcType="INTEGER"/>
         <result property="mediaUrl" column="media_url" jdbcType="VARCHAR"/>
+        <result property="mediaSize" column="media_size" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="deleteFlag" column="delete_flag" jdbcType="INTEGER"/>
@@ -22,6 +23,7 @@
                media_title,
                media_type,
                media_url,
+               media_size,
                create_time,
                update_time,
                delete_flag
@@ -36,6 +38,7 @@
                media_title,
                media_type,
                media_url,
+               media_size,
                create_time,
                update_time,
                delete_flag
@@ -45,10 +48,12 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="welcomeSuitRangId" useGeneratedKeys="false">
-        insert into tab_haoban_welcome_media(welcome_media_id, wx_enterprise_id, welcome_id, media_title, media_type, media_url,
+        insert into tab_haoban_welcome_media(welcome_media_id, wx_enterprise_id, welcome_id,
+                                             media_title, media_type, media_url,media_size,
                                                      create_time, update_time, delete_flag)
-        values (#{welcomeMediaId}, #{wxEnterpriseId}, #{welcomeId}, #{mediaTitle}, #{mediaType}, #{mediaUrl}, #{createTime}, #{updateTime},
-                #{deleteFlag})
+        values (#{welcomeMediaId}, #{wxEnterpriseId}, #{welcomeId},
+                #{mediaTitle}, #{mediaType}, #{mediaUrl},#{mediaSize},
+                #{createTime}, #{updateTime},#{deleteFlag})
     </insert>
 
     <!--通过主键修改数据-->

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/welcome/SaveWelcomeMediaQO.java

@@ -23,6 +23,10 @@ public class SaveWelcomeMediaQO implements Serializable {
      * @see com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum
      */
     private Integer mediaType;
+    /**
+     * 资源大小
+     */
+    private Integer mediaSize;
 
     public String getMediaTitle() {
         return mediaTitle;
@@ -48,6 +52,14 @@ public class SaveWelcomeMediaQO implements Serializable {
         this.mediaType = mediaType;
     }
 
+    public Integer getMediaSize() {
+        return mediaSize;
+    }
+
+    public void setMediaSize(Integer mediaSize) {
+        this.mediaSize = mediaSize;
+    }
+
     @Override
     public String toString() {
         return "SaveWelcomeMediaQO{" +