Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java

@@ -1,6 +1,9 @@
 package com.flossom.common.core.domain.entity;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;
@@ -77,6 +80,17 @@ public class WxMode extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private Long status;
 
+    // 展示标签
+    private String lockWechatTag;
+
+    private String lockCompanyTag;
+
+
+    private List<Long> lockWechatTagArray = new ArrayList<Long>();
+
+    private List<Long> lockCompanyTagArray = new ArrayList<Long>();
+
+
     public void setId(Long id)
     {
         this.id = id;
@@ -213,6 +227,38 @@ public class WxMode extends BaseEntity
         return status;
     }
 
+    public String getLockWechatTag() {
+        return lockWechatTag;
+    }
+
+    public void setLockWechatTag(String lockWechatTag) {
+        this.lockWechatTag = lockWechatTag;
+    }
+
+    public String getLockCompanyTag() {
+        return lockCompanyTag;
+    }
+
+    public void setLockCompanyTag(String lockCompanyTag) {
+        this.lockCompanyTag = lockCompanyTag;
+    }
+
+    public List<Long> getLockWechatTagArray() {
+        return lockWechatTagArray;
+    }
+
+    public void setLockWechatTagArray(List<Long> lockWechatTagArray) {
+        this.lockWechatTagArray = lockWechatTagArray;
+    }
+
+    public List<Long> getLockCompanyTagArray() {
+        return lockCompanyTagArray;
+    }
+
+    public void setLockCompanyTagArray(List<Long> lockCompanyTagArray) {
+        this.lockCompanyTagArray = lockCompanyTagArray;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java

@@ -0,0 +1,98 @@
+package com.flossom.common.core.domain.entity;
+
+import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 模式与标签关联对象 wx_mode_tag
+ *
+ * @author flossom
+ * @date 2024-01-18
+ */
+public class WxModeTag extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 模式主键 */
+    @Excel(name = "模式主键")
+    private Long modeId;
+
+    /** 标签主键 */
+    @Excel(name = "标签主键")
+    private Long tagId;
+
+    /** 标签类型（1小程序标签 2企微标签） */
+    @Excel(name = "标签类型", readConverterExp = "1=小程序标签,2=企微标签")
+    private Long tagType;
+
+    /** 状态（0正常 1禁用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=禁用")
+    private Long status;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setModeId(Long modeId)
+    {
+        this.modeId = modeId;
+    }
+
+    public Long getModeId()
+    {
+        return modeId;
+    }
+    public void setTagId(Long tagId)
+    {
+        this.tagId = tagId;
+    }
+
+    public Long getTagId()
+    {
+        return tagId;
+    }
+    public void setTagType(Long tagType)
+    {
+        this.tagType = tagType;
+    }
+
+    public Long getTagType()
+    {
+        return tagType;
+    }
+    public void setStatus(Long status)
+    {
+        this.status = status;
+    }
+
+    public Long getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("modeId", getModeId())
+            .append("tagId", getTagId())
+            .append("tagType", getTagType())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeTagMapper.java

@@ -0,0 +1,71 @@
+package com.flossom.common.core.mapper;
+
+import com.flossom.common.core.domain.entity.WxModeTag;
+
+import java.util.List;
+
+/**
+ * 模式与标签关联Mapper接口
+ *
+ * @author flossom
+ * @date 2024-01-18
+ */
+public interface WxModeTagMapper
+{
+    /**
+     * 查询模式与标签关联
+     *
+     * @param id 模式与标签关联主键
+     * @return 模式与标签关联
+     */
+    public WxModeTag selectWxModeTagById(Long id);
+
+    /**
+     * 查询模式与标签关联列表
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 模式与标签关联集合
+     */
+    public List<WxModeTag> selectWxModeTagList(WxModeTag wxModeTag);
+
+    /**
+     * 新增模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    public int insertWxModeTag(WxModeTag wxModeTag);
+
+    /**
+     * 修改模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    public int updateWxModeTag(WxModeTag wxModeTag);
+
+    /**
+     * 删除模式与标签关联
+     *
+     * @param id 模式与标签关联主键
+     * @return 结果
+     */
+    public int deleteWxModeTagById(Long id);
+
+    /**
+     * 批量删除模式与标签关联
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWxModeTagByIds(Long[] ids);
+
+
+    /**
+     * 删除模式与标签关联
+     *
+     * @param modeId 模式ID
+     * @return 结果
+     */
+    public int deleteWxModeTagByModeId(Long modeId);
+}

flossom-common/flossom-common-core/src/main/resources/mapper/WxModeMapper.xml

@@ -132,6 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from wx_mode where id = #{id}
     </delete>
 
+
+
     <delete id="deleteWxModeByIds" parameterType="String">
         delete from wx_mode where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">

flossom-common/flossom-common-core/src/main/resources/mapper/WxModeTagMapper.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.flossom.common.core.mapper.WxModeTagMapper">
+
+    <resultMap type="WxModeTag" id="WxModeTagResult">
+        <result property="id"    column="id"    />
+        <result property="modeId"    column="mode_id"    />
+        <result property="tagId"    column="tag_id"    />
+        <result property="tagType"    column="tag_type"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectWxModeTagVo">
+        select id, mode_id, tag_id, tag_type, status, create_by, create_time, update_by, update_time, remark from wx_mode_tag
+    </sql>
+
+    <select id="selectWxModeTagList" parameterType="WxModeTag" resultMap="WxModeTagResult">
+        <include refid="selectWxModeTagVo"/>
+        <where>
+            <if test="modeId != null "> and mode_id = #{modeId}</if>
+            <if test="tagId != null "> and tag_id = #{tagId}</if>
+            <if test="tagType != null "> and tag_type = #{tagType}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+    </select>
+
+    <select id="selectWxModeTagById" parameterType="Long" resultMap="WxModeTagResult">
+        <include refid="selectWxModeTagVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertWxModeTag" parameterType="WxModeTag" useGeneratedKeys="true" keyProperty="id">
+        insert into wx_mode_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="modeId != null">mode_id,</if>
+            <if test="tagId != null">tag_id,</if>
+            <if test="tagType != null">tag_type,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="modeId != null">#{modeId},</if>
+            <if test="tagId != null">#{tagId},</if>
+            <if test="tagType != null">#{tagType},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWxModeTag" parameterType="WxModeTag">
+        update wx_mode_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="modeId != null">mode_id = #{modeId},</if>
+            <if test="tagId != null">tag_id = #{tagId},</if>
+            <if test="tagType != null">tag_type = #{tagType},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteWxModeTagById" parameterType="Long">
+        delete from wx_mode_tag where id = #{id}
+    </delete>
+
+    <delete id="deleteWxModeTagByModeId" parameterType="Long">
+        delete from wx_mode_tag where mode_id = #{modeId}
+    </delete>
+
+    <delete id="deleteWxModeTagByIds" parameterType="String">
+        delete from wx_mode_tag where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java

@@ -2,10 +2,16 @@ package com.flossom.system.controller;
 
 import java.util.List;
 import java.io.IOException;
+import java.util.Objects;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.flossom.common.core.domain.entity.SysTag;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.entity.WxMode;
+import com.flossom.common.core.domain.entity.WxModeTag;
+import com.flossom.common.core.enums.TagTypeStatus;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -13,6 +19,9 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
+import com.flossom.system.service.ISysTagService;
+import com.flossom.system.service.IWxModeTagService;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.flossom.system.service.IWxModeService;
 
 /**
- * 模式列Controller
+ * 模式列表Controller
  *
  * @author flossom
  * @date 2024-01-17
@@ -36,9 +45,13 @@ public class WxModeController extends BaseController
 {
     @Autowired
     private IWxModeService wxModeService;
+    @Autowired
+    private IWxModeTagService wxModeTagService;
+    @Autowired
+    private ISysTagService sysTagService;
 
     /**
-     * 查询模式列列表
+     * 查询模式列表列表
      */
     @RequiresPermissions("system:mode:list")
     @GetMapping("/list")
@@ -46,6 +59,37 @@ public class WxModeController extends BaseController
     {
         startPage();
         List<WxMode> list = wxModeService.selectWxModeList(wxMode);
+        // 处理标签显示
+        for(WxMode mode : list) {
+            List<String> wechatList = Lists.newArrayList();
+            List<String> companyList = Lists.newArrayList();
+            WxModeTag modeTag = new WxModeTag();
+            modeTag.setModeId(mode.getId());
+            List<WxModeTag> wxModeTags = wxModeTagService.selectWxModeTagList(modeTag);
+            if (CollectionUtils.isNotEmpty(wxModeTags)) {
+                for(WxModeTag wxModeTag : wxModeTags) {
+                    Long tagId = wxModeTag.getTagId();
+                    if (Objects.nonNull(tagId)) {
+                        SysTag sysTag = sysTagService.selectDeptById(tagId);
+                        if (Objects.nonNull(sysTag)) {
+                            if (String.valueOf(TagTypeStatus.MINI_PROGRAM.getCode()).equals(String.valueOf(wxModeTag.getTagType()))) {
+                                wechatList.add(sysTag.getTagName());
+                            } else {
+                                companyList.add(sysTag.getTagName());
+                            }
+                        }
+                    }
+                }
+            }
+            if (CollectionUtils.isNotEmpty(wechatList)) {
+                String wechatTag = wechatList.stream().map(String::valueOf).collect(Collectors.joining(","));
+                mode.setLockWechatTag(wechatTag);
+            }
+            if (CollectionUtils.isNotEmpty(companyList)) {
+                String companyTag = companyList.stream().map(String::valueOf).collect(Collectors.joining(","));
+                mode.setLockCompanyTag(companyTag);
+            }
+        }
         return getDataTable(list);
     }
 
@@ -60,20 +104,20 @@ public class WxModeController extends BaseController
     }
 
     /**
-     * 导出模式列列表
+     * 导出模式列表列表
      */
     @RequiresPermissions("system:mode:export")
-    @Log(title = "模式列", businessType = BusinessType.EXPORT)
+    @Log(title = "模式列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, WxMode wxMode)
     {
         List<WxMode> list = wxModeService.selectWxModeList(wxMode);
         ExcelUtil<WxMode> util = new ExcelUtil<WxMode>(WxMode.class);
-        util.exportExcel(response, list, "模式列数据");
+        util.exportExcel(response, list, "模式列表数据");
     }
 
     /**
-     * 获取模式列详细信息
+     * 获取模式列表详细信息
      */
     @RequiresPermissions("system:mode:query")
     @GetMapping(value = "/{id}")
@@ -83,10 +127,10 @@ public class WxModeController extends BaseController
     }
 
     /**
-     * 新增模式列
+     * 新增模式列表
      */
     @RequiresPermissions("system:mode:add")
-    @Log(title = "模式列", businessType = BusinessType.INSERT)
+    @Log(title = "模式列表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WxMode wxMode)
     {
@@ -94,10 +138,10 @@ public class WxModeController extends BaseController
     }
 
     /**
-     * 修改模式列
+     * 修改模式列表
      */
     @RequiresPermissions("system:mode:edit")
-    @Log(title = "模式列", businessType = BusinessType.UPDATE)
+    @Log(title = "模式列表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody WxMode wxMode)
     {
@@ -105,10 +149,10 @@ public class WxModeController extends BaseController
     }
 
     /**
-     * 删除模式列
+     * 删除模式列表
      */
     @RequiresPermissions("system:mode:remove")
-    @Log(title = "模式列", businessType = BusinessType.DELETE)
+    @Log(title = "模式列表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeTagService.java

@@ -0,0 +1,62 @@
+package com.flossom.system.service;
+
+import com.flossom.common.core.domain.entity.WxModeTag;
+
+import java.util.List;
+
+/**
+ * 模式与标签关联Service接口
+ *
+ * @author flossom
+ * @date 2024-01-18
+ */
+public interface IWxModeTagService
+{
+    /**
+     * 查询模式与标签关联
+     *
+     * @param id 模式与标签关联主键
+     * @return 模式与标签关联
+     */
+    public WxModeTag selectWxModeTagById(Long id);
+
+    /**
+     * 查询模式与标签关联列表
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 模式与标签关联集合
+     */
+    public List<WxModeTag> selectWxModeTagList(WxModeTag wxModeTag);
+
+    /**
+     * 新增模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    public int insertWxModeTag(WxModeTag wxModeTag);
+
+    /**
+     * 修改模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    public int updateWxModeTag(WxModeTag wxModeTag);
+
+    /**
+     * 批量删除模式与标签关联
+     *
+     * @param ids 需要删除的模式与标签关联主键集合
+     * @return 结果
+     */
+    public int deleteWxModeTagByIds(Long[] ids);
+
+    /**
+     * 删除模式与标签关联信息
+     *
+     * @param id 模式与标签关联主键
+     * @return 结果
+     */
+    public int deleteWxModeTagById(Long id);
+}

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java

@@ -1,10 +1,17 @@
 package com.flossom.system.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.flossom.common.core.domain.entity.WxMode;
+import com.flossom.common.core.domain.entity.WxModeTag;
+import com.flossom.common.core.enums.TagTypeStatus;
 import com.flossom.common.core.mapper.WxModeMapper;
+import com.flossom.common.core.mapper.WxModeTagMapper;
 import com.flossom.common.core.utils.DateUtils;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxModeService;
@@ -20,7 +27,8 @@ public class WxModeServiceImpl implements IWxModeService
 {
     @Autowired
     private WxModeMapper wxModeMapper;
-
+    @Autowired
+    private WxModeTagMapper wxModeTagMapper;
     /**
      * 查询模式列
      *
@@ -30,7 +38,24 @@ public class WxModeServiceImpl implements IWxModeService
     @Override
     public WxMode selectWxModeById(Long id)
     {
-        return wxModeMapper.selectWxModeById(id);
+        WxMode wxMode = wxModeMapper.selectWxModeById(id);
+        // 处理标签回显
+        WxModeTag wxModeTag = new WxModeTag();
+        wxModeTag.setModeId(id);
+        List<WxModeTag> wxModeTags = wxModeTagMapper.selectWxModeTagList(wxModeTag);
+        if (CollectionUtils.isNotEmpty(wxModeTags)) {
+            List<WxModeTag> wechatList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatus.MINI_PROGRAM.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList());
+            List<WxModeTag> companyList = wxModeTags.stream().filter(x -> String.valueOf(TagTypeStatus.ENTERPRISE_WECHAT.getCode()).equals(String.valueOf(x.getTagType()))).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(wechatList)) {
+                List<Long> wechatIds = wechatList.stream().map(WxModeTag::getTagId).collect(Collectors.toList());
+                wxMode.setLockWechatTagArray(wechatIds);
+            }
+            if (CollectionUtils.isNotEmpty(companyList)) {
+                List<Long> companyIds = companyList.stream().map(WxModeTag::getTagId).collect(Collectors.toList());
+                wxMode.setLockCompanyTagArray(companyIds);
+            }
+        }
+        return wxMode;
     }
 
     /**
@@ -55,7 +80,32 @@ public class WxModeServiceImpl implements IWxModeService
     public int insertWxMode(WxMode wxMode)
     {
         wxMode.setCreateTime(DateUtils.getNowDate());
-        return wxModeMapper.insertWxMode(wxMode);
+        int i = wxModeMapper.insertWxMode(wxMode);
+        // 插入企微关联关系
+        if (CollectionUtils.isNotEmpty(wxMode.getLockCompanyTagArray())) {
+            List<Long> lockCompanyTagArray = wxMode.getLockCompanyTagArray();
+            for (Long tagId : lockCompanyTagArray) {
+                WxModeTag modeTag = new WxModeTag();
+                modeTag.setModeId(wxMode.getId());
+                modeTag.setTagId(tagId);
+                modeTag.setTagType(2l);
+                modeTag.setCreateTime(DateUtils.getNowDate());
+                wxModeTagMapper.insertWxModeTag(modeTag);
+            }
+        }
+        // 插入小程序关联关系
+        if (CollectionUtils.isNotEmpty(wxMode.getLockWechatTagArray())) {
+            List<Long> lockWechatTagArray = wxMode.getLockWechatTagArray();
+            for (Long tagId : lockWechatTagArray) {
+                WxModeTag modeTag = new WxModeTag();
+                modeTag.setModeId(wxMode.getId());
+                modeTag.setTagId(tagId);
+                modeTag.setTagType(1l);
+                modeTag.setCreateTime(DateUtils.getNowDate());
+                wxModeTagMapper.insertWxModeTag(modeTag);
+            }
+        }
+        return i;
     }
 
     /**
@@ -68,6 +118,33 @@ public class WxModeServiceImpl implements IWxModeService
     public int updateWxMode(WxMode wxMode)
     {
         wxMode.setUpdateTime(DateUtils.getNowDate());
+        // 先删除关联关系
+        wxModeTagMapper.deleteWxModeTagByModeId(wxMode.getId());
+
+        // 插入企微关联关系
+        if (CollectionUtils.isNotEmpty(wxMode.getLockCompanyTagArray())) {
+            List<Long> lockCompanyTagArray = wxMode.getLockCompanyTagArray();
+            for (Long tagId : lockCompanyTagArray) {
+                WxModeTag modeTag = new WxModeTag();
+                modeTag.setModeId(wxMode.getId());
+                modeTag.setTagId(tagId);
+                modeTag.setTagType(2l);
+                modeTag.setCreateTime(DateUtils.getNowDate());
+                wxModeTagMapper.insertWxModeTag(modeTag);
+            }
+        }
+        // 插入小程序关联关系
+        if (CollectionUtils.isNotEmpty(wxMode.getLockWechatTagArray())) {
+            List<Long> lockWechatTagArray = wxMode.getLockWechatTagArray();
+            for (Long tagId : lockWechatTagArray) {
+                WxModeTag modeTag = new WxModeTag();
+                modeTag.setModeId(wxMode.getId());
+                modeTag.setTagId(tagId);
+                modeTag.setTagType(1l);
+                modeTag.setCreateTime(DateUtils.getNowDate());
+                wxModeTagMapper.insertWxModeTag(modeTag);
+            }
+        }
         return wxModeMapper.updateWxMode(wxMode);
     }
 

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeTagServiceImpl.java

@@ -0,0 +1,97 @@
+package com.flossom.system.service.impl;
+
+import java.util.List;
+
+import com.flossom.common.core.domain.entity.WxModeTag;
+import com.flossom.common.core.mapper.WxModeTagMapper;
+import com.flossom.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.flossom.system.service.IWxModeTagService;
+
+/**
+ * 模式与标签关联Service业务层处理
+ *
+ * @author flossom
+ * @date 2024-01-18
+ */
+@Service
+public class WxModeTagServiceImpl implements IWxModeTagService
+{
+    @Autowired
+    private WxModeTagMapper wxModeTagMapper;
+
+    /**
+     * 查询模式与标签关联
+     *
+     * @param id 模式与标签关联主键
+     * @return 模式与标签关联
+     */
+    @Override
+    public WxModeTag selectWxModeTagById(Long id)
+    {
+        return wxModeTagMapper.selectWxModeTagById(id);
+    }
+
+    /**
+     * 查询模式与标签关联列表
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 模式与标签关联
+     */
+    @Override
+    public List<WxModeTag> selectWxModeTagList(WxModeTag wxModeTag)
+    {
+        return wxModeTagMapper.selectWxModeTagList(wxModeTag);
+    }
+
+    /**
+     * 新增模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    @Override
+    public int insertWxModeTag(WxModeTag wxModeTag)
+    {
+        wxModeTag.setCreateTime(DateUtils.getNowDate());
+        return wxModeTagMapper.insertWxModeTag(wxModeTag);
+    }
+
+    /**
+     * 修改模式与标签关联
+     *
+     * @param wxModeTag 模式与标签关联
+     * @return 结果
+     */
+    @Override
+    public int updateWxModeTag(WxModeTag wxModeTag)
+    {
+        wxModeTag.setUpdateTime(DateUtils.getNowDate());
+        return wxModeTagMapper.updateWxModeTag(wxModeTag);
+    }
+
+    /**
+     * 批量删除模式与标签关联
+     *
+     * @param ids 需要删除的模式与标签关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxModeTagByIds(Long[] ids)
+    {
+        return wxModeTagMapper.deleteWxModeTagByIds(ids);
+    }
+
+    /**
+     * 删除模式与标签关联信息
+     *
+     * @param id 模式与标签关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxModeTagById(Long id)
+    {
+        return wxModeTagMapper.deleteWxModeTagById(id);
+    }
+}

flossom-ui/src/views/system/mode/index.vue

@@ -167,8 +167,8 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="解锁小程序标签" align="center" prop="modeDesc" />
+      <el-table-column label="解锁小程序标签" align="center" prop="lockWechatTag" />
-      <el-table-column label="解锁企微标签" align="center" prop="modeDesc" />
+      <el-table-column label="解锁企微标签" align="center" prop="lockCompanyTag" />
       <el-table-column label="备注 " align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -199,7 +199,7 @@
     />
 
     <!-- 添加或修改模式列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="closeOpen">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="仪器类型" prop="instrumentType">
           <el-select v-model="form.instrumentType">
@@ -217,14 +217,16 @@
           <el-upload
             :action="upload.url"
             :headers="upload.headers"
+            :file-list="bannerList"
             list-type="picture-card"
             :on-preview="handlePreviewFile"
             :on-success="handleBannerFileSuccess"
-            :on-remove="handleRemove">
+            :before-upload="beforeBannerUpload"
+            :on-remove="handleRemoveBanner">
             <i class="el-icon-plus"></i>
           </el-upload>
           <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="form.modeBanner" alt="">
+            <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
         </el-form-item>
         <el-form-item label="模式视频" prop="modeVideo">
@@ -241,6 +243,12 @@
             <div slot="tip" class="el-upload__tip">只能上传视频文件，且不超过50M</div>
           </el-upload>
         </el-form-item>
+        <el-form-item label="解锁小程序标签" prop="showWechatTagId" label-width="120px">
+          <treeselect v-model="form.lockWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
+        </el-form-item>
+        <el-form-item label="解锁企微标签" prop="showCompanyTagId" label-width="120px">
+          <treeselect v-model="form.lockCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="50"></el-input>
         </el-form-item>
@@ -248,7 +256,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">重 置</el-button>
       </div>
     </el-dialog>
   </div>
@@ -257,9 +265,12 @@
 <script>
 import { listMode, getMode, delMode, addMode, updateMode } from "@/api/system/mode";
 import {getToken} from "@/utils/auth";
-
+import { tagTreeSelect } from "@/api/system/wechatTab";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Mode",
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -274,6 +285,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      tagOptions: [],
+      chatTagOptions: [],
       // 模式列表表格数据
       modeList: [],
       dialogImageUrl: '',
@@ -340,6 +353,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
     /** 查询模式列表列表 */
@@ -351,9 +365,14 @@ export default {
         this.loading = false;
       });
     },
+    closeOpen(){
+      this.fileList = [];
+      this.bannerList = [];
+      this.open = false;
+    },
     // 取消按钮
     cancel() {
-      this.open = false;
+      // this.open = false;
       this.reset();
     },
     // 表单重置
@@ -381,6 +400,8 @@ export default {
         remark: null
       };
       this.resetForm("form");
+      this.bannerList = [];
+      this.fileList = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -403,17 +424,36 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加模式";
+      this.form.instrumentType = 1;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+      this.bannerList = [];
+      this.fileList = [];
       getMode(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改模式";
+        this.fileList.push({
+          name: this.handleFileInfo(this.form.modeVideo),
+          url: this.form.modeVideo
+        })
+        this.bannerList.push({
+          name: this.handleFileInfo(this.form.modeBanner),
+          url: this.form.modeBanner
+        })
       });
     },
+    handleFileInfo(url) {
+      if (url) {
+        const filePath = url.substring(0, url.lastIndexOf("/"));
+        // 获取文件名（包括扩展名）
+        const fileNameWithExtension = url.substr(filePath.length + 1);
+        return fileNameWithExtension
+      }
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -444,6 +484,15 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    /** 查询标签下拉树结构 */
+    getDeptTree() {
+      tagTreeSelect({type: 2}).then(response => {
+        this.tagOptions = response.data;
+      });
+      tagTreeSelect({type: 1}).then(response => {
+        this.chatTagOptions = response.data;
+      });
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/mode/export', {
@@ -451,7 +500,12 @@ export default {
       }, `mode_${new Date().getTime()}.xlsx`)
     },
     handleRemove(file, fileList) {
-      console.log(file, fileList);
+      console.log('调用了')
+      this.fileList = [];
+    },
+    handleRemoveBanner(file, fileList) {
+      // console.log('调用了删除')
+      this.bannerList = [];
     },
     handlePreview(file) {
       console.log(file);
@@ -465,20 +519,28 @@ export default {
           name: response.data.name,
           url: response.data.url,
         })
+        this.form.modeVideo = response.data.url;
       }
     },
     // 封面上传成功处理
     handleBannerFileSuccess(response, file, fileList, item) {
       console.log('上传后的结果==>',JSON.stringify(response))
       if(response.code == '200') {
+        this.bannerList = [];
         this.form.modeBanner = response.data.url;
-        this.bannerList.push(response.data.url);
+        this.bannerList.push({name:response.data.name,url:response.data.url});
       }
     },
     handlePreviewFile(file){
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
+    beforeBannerUpload(){
+      // if(this.bannerList.length == 1){
+      //   this.$message.error('当前封面图片只支持上传一张');
+      //   return false;
+      // }
+    }
   }
 };
 </script>