磁贴父子结构标记

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -73,6 +73,21 @@ public class WxPortalController extends ApiBaseController {
         return AjaxResult.success().putKV("magnets",wxMagnetList).putKV("banners",wxBannerList);
     }
 
+    @ApiOperation(value = "磁贴下标记权限磁贴",notes = "参数：{userId,magnetName}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("/wxMagnetRoleByUserId")
+    public Object getWxMagnetRoleByUserId(){
+        ParameterObject obj =  getParameterObject();
+        obj.checkParameterNotNull("userId,magnetName");
+        String magnetName = obj.getString("magnetName");
+        Long userId = obj.getLong("userId");
+        List<WxMagnet> wxMagnetList =  wxMagnetService.selectWxMagnetRoleByUserId(userId,magnetName);
+
+        return AjaxResult.success().putKV("magnets",wxMagnetList);
+    }
+
     @ApiOperation(value = "通知公告")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "params" , paramType = "body")

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/WxMagnet.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * H5磁贴表 wx_magnet
- * 
+ *
  * @author dgtly
  */
 public class WxMagnet extends BaseEntity
@@ -36,6 +36,9 @@ public class WxMagnet extends BaseEntity
     /** 菜单状态:0显示,1隐藏 */
     private String visible;
 
+    /** 磁贴标记父结构磁贴名词*/
+    private String fatherMagnet;
+
     /** 磁贴尺寸（S:小（1x1），M:中(2x1)，L：大(3Map  x1)） */
     private String magnetSize;
 
@@ -139,6 +142,14 @@ public class WxMagnet extends BaseEntity
         return magnetType;
     }
 
+    public String getFatherMagnet() {
+        return fatherMagnet;
+    }
+
+    public void setFatherMagnet(String fatherMagnet) {
+        this.fatherMagnet = fatherMagnet;
+    }
+
     public void setMagnetType(String magnetType) {
         this.magnetType = magnetType;
     }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/WxMagnetMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 菜单表 数据层
- * 
+ *
  * @author dgtly
  */
 public interface WxMagnetMapper
@@ -117,6 +117,14 @@ public interface WxMagnetMapper
 
     List<WxMagnet> selectMagnetByCw(@Param("userId") String userId, @Param("roleId")String roleId);
 
+    /**
+     * @description: 根据用户名词和磁贴名词查询子标记
+     * @param: [userId, magnetName]
+     * @return: java.util.List<com.dgtly.wxportal.domain.WxMagnet>
+     * @author: njs
+     * @date: 2024/5/21 14:21
+     */
+    List<WxMagnet> selectWxMagnetRoleByUserId(@Param("userId") Long userId, @Param("magnetName")String magnetName);
 
     String selectSapEmploeeIdByUserId(String userId);
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IWxMagnetService.java

@@ -13,7 +13,7 @@ import java.util.Set;
 
 /**
  * 菜单 业务层
- * 
+ *
  * @author dgtly
  */
 public interface IWxMagnetService
@@ -21,7 +21,7 @@ public interface IWxMagnetService
 
     /**
      * 查询H5磁贴列表
-     * 
+     *
      * @param wxMagnet 磁贴信息
      * @param userId 用户ID
      * @return 磁贴列表
@@ -109,4 +109,6 @@ public interface IWxMagnetService
      * @return
      */
     List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel);
+
+    List<WxMagnet> selectWxMagnetRoleByUserId(Long userId,String magnetName);
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.*;
 
 /**
  * 菜单 业务层处理
- * 
+ *
  * @author dgtly
  */
 @Service
@@ -234,7 +234,12 @@ public class WxMagnetServiceImpl implements IWxMagnetService
         return list;
     }
 
+    @Override
+    public List<WxMagnet> selectWxMagnetRoleByUserId(Long userId, String magnetName) {
+        List<WxMagnet> list  = wxMagnetMapper.selectWxMagnetRoleByUserId(userId,magnetName);
 
+        return null;
+    }
 
 
     public static String KL(String inStr) {

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="com.dgtly.wxportal.domain.WxMagnet" id="WxMagnetResult">
         <id     property="magnetId"       column="magnet_id"        />
         <result property="magnetName"     column="magnet_name"      />
+        <result property="fatherMagnet"     column="father_magnet"      />
         <result property="orderNum"       column="order_num"      />
         <result property="url"            column="url"            />
         <result property="visible"        column="visible"        />
@@ -24,18 +25,18 @@
     </resultMap>
 
     <sql id="selectMagnetVo">
-        select magnet_id, magnet_name, order_num, url,  visible, magnet_size, bg_url ,remark, magnet_type, applet_qr_url, create_by, create_time
+        select magnet_id, magnet_name, father_magnet,order_num, url,  visible, magnet_size, bg_url ,remark, magnet_type, applet_qr_url, create_by, create_time
 		from wx_magnet
     </sql>
 
     <select id="selectTileMagnetList" parameterType="com.dgtly.wxportal.domain.WxMagnet" resultMap="WxMagnetResult">
-    select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
+    select distinct m.magnet_id, m.father_magnet, m.magnet_name, m.url, m.visible, m.magnet_size
     , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
     from wx_magnet m where  m.visible =0
     </select>
 
     <select id="selectMagnetList" parameterType="com.dgtly.wxportal.domain.WxMagnet" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id, m.father_magnet, m.magnet_name, m.url, m.visible, m.magnet_size
         , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
         from wx_magnet m
         <where>
@@ -79,6 +80,7 @@
         insert into wx_magnet(
         <if test="magnetId != null and magnetId != 0">magnet_id,</if>
         <if test="magnetName != null and magnetName != ''">magnet_name,</if>
+        <if test="fatherMagnet != null and fatherMagnet != ''">father_magnet,</if>
         <if test="orderNum != null and orderNum != ''">order_num,</if>
         <if test="url != null and url != ''">url,</if>
         <if test="visible != null">visible,</if>
@@ -92,6 +94,7 @@
         )values(
         <if test="magnetId != null and magnetId != 0">#{magnetId},</if>
         <if test="magnetName != null and magnetName != ''">#{magnetName},</if>
+        <if test="fatherMagnet != null and fatherMagnet != ''">#{fatherMagnet},</if>
         <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
         <if test="url != null and url != ''">#{url},</if>
         <if test="visible != null">#{visible},</if>
@@ -109,6 +112,7 @@
         update wx_magnet
         <set>
             <if test="magnetName != null and magnetName != ''">magnet_name = #{magnetName},</if>
+            <if test="fatherMagnet != null and fatherMagnet != ''">father_magnet =#{fatherMagnet},</if>
             <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
             <if test="url != null and url != ''">url = #{url},</if>
             <if test="visible != null">visible = #{visible},</if>
@@ -129,7 +133,7 @@
     </select>
 
     <select id="selectMagnetAllByUserId"  resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
         , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
         from wx_magnet m
         left join wx_role_magnet rm on m.magnet_id = rm.magnet_id
@@ -173,7 +177,7 @@
     </insert>
 
     <select id="selectMagnetByUserId" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
         , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url,m.is_encry
         from wx_magnet m
         left join wx_role_magnet rm on m.magnet_id = rm.magnet_id
@@ -185,8 +189,23 @@
         </where>
         order by  m.order_num
     </select>
+
+    <select id="selectWxMagnetRoleByUserId" parameterType="String" resultMap="WxMagnetResult">
+        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
+        , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url,m.is_encry
+        from wx_magnet m
+        left join wx_role_magnet rm on m.magnet_id = rm.magnet_id
+        left join sys_user_role ur on rm.role_id = ur.role_id
+        LEFT JOIN sys_role ro on ur.role_id = ro.role_id
+        <where>
+            ur.user_id = #{userId}
+             and father_magnet =#{magnetName}
+        </where>
+        order by  m.order_num
+    </select>
+
     <select id="selectMagnetByCw" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
         , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url,m.is_encry
         from wx_magnet m
         left join wx_role_magnet rm on m.magnet_id = rm.magnet_id
@@ -204,4 +223,4 @@
     </select>
 
 
-</mapper> 
+</mapper>

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/add.html

@@ -157,6 +157,12 @@
             </div>
         </div>
 
+            <div class="form-group">
+                <label class="col-sm-3 control-label">磁贴标记父结构：</label>
+                <div class="col-sm-8">
+                    <input class="form-control" type="text" name="fatherMagnet" id="fatherMagnet" >
+                </div>
+            </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">备注：</label>
             <div class="col-sm-8">

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/edit.html

@@ -153,7 +153,13 @@
                 </div>
             </div>
         </div>
-
+        <div class="form-group">
+            <label class="col-sm-3 control-label">磁贴标记父结构：</label>
+            <div class="col-sm-8">
+                <input class="form-control" type="text" name="fatherMagnet" id="fatherMagnet" th:field="*{fatherMagnet}"
+                       >
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">备注：</label>
             <div class="col-sm-8">