修改磁贴名增加系统

suishenbang-framework/src/main/java/com/dgtly/framework/aspectj/DataScopeAspect.java

@@ -96,7 +96,6 @@ public class DataScopeAspect
      * 
      * @param joinPoint 切点
      * @param user 用户
-     * @param alias 别名
      */
     public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
     {

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

@@ -82,7 +82,7 @@ public class WxPortalController extends ApiBaseController {
     @PostMapping("/portalData")
     public Object getMagent(){
         ParameterObject obj =  getParameterObject();
-        obj.checkParameterNotNull("userId,agent");
+        obj.checkParameterNotNull("userId,agent,userType");
         String loginType="";
         List<Map<String, Object>> loginTypeList = jdbcTemplate.queryForList("select dict_label shopType,dict_value shopTypeValue  from sys_dict_data where  dict_type='system_login_type'  and dict_label=?  ",obj.getString("agent"));
         if(loginTypeList.size()!=0){
@@ -91,6 +91,11 @@ public class WxPortalController extends ApiBaseController {
 
         WxBanner wxBanner = new WxBanner();
         List<WxMagnet> wxMagnetList =  wxMagnetService.selectMagnetByUserId(obj.getString("userId"), obj.getString("cw"), obj.getString("salesLevel"),loginType);
+        //筛选掉没有权限的磁贴
+        String userType = obj.getString("userType");
+        wxMagnetList = wxMagnetList.stream()
+                .filter(magnet -> userType.equals(magnet.getUserType()))
+                .collect(Collectors.toList());
         List<WxBanner> wxBannerList = wxBannerService.selectWxBannerList(wxBanner);
         return AjaxResult.success().putKV("magnets",wxMagnetList).putKV("banners",wxBannerList);
     }

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

@@ -8,8 +8,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * H5磁贴表 wx_magnet
@@ -26,12 +24,14 @@ public class WxMagnet extends BaseEntity
     /** 菜单名称 */
     private String magnetName;
 
-    /** 磁贴别名 */
-    private String alias;
 
     /** 显示顺序 */
     private String orderNum;
 
+
+    /** 用户类型 */
+    private String userType;
+
     /** 磁贴URL */
     private String url;
 
@@ -69,13 +69,6 @@ public class WxMagnet extends BaseEntity
         return magnetId;
     }
 
-    public String getAlias() {
-        return alias;
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
 
     public void setMagnetId(Long magnetId)
     {
@@ -180,6 +173,14 @@ public class WxMagnet extends BaseEntity
         this.isEncry = isEncry;
     }
 
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -58,7 +58,7 @@ public interface WxMagnetMapper
      * @param magnetName 磁贴名称
      * @return 结果
      */
-    List<WxMagnet> checkMagnetNameUnique(@Param("magnetName") String magnetName);
+    WxMagnet checkMagnetNameUnique(@Param("magnetName") String magnetName);
 
     /**
      * 新增保存磁贴信息

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

@@ -111,7 +111,7 @@ public class WxMagnetServiceImpl implements IWxMagnetService
     @Override
     public String checkMagnetNameUnique(WxMagnet wxMagnet) {
         Long magnetId = StringUtils.isNull(wxMagnet.getMagnetId()) ? -1L : wxMagnet.getMagnetId();
-        List<WxMagnet> info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName());
+        WxMagnet info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName());
         if (StringUtils.isNotNull(info) && info.getMagnetId().longValue() != magnetId.longValue())
         {
             return UserConstants.MENU_NAME_NOT_UNIQUE;
@@ -216,16 +216,10 @@ public class WxMagnetServiceImpl implements IWxMagnetService
      */
     @Override
     public List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel,String  loginType) {
-//        List<WxMagnet> list;
-//        if (StringUtils.isNotEmpty(cw) && null != salesLevel && "customer_level".equals(salesLevel)) {
-//            String roleId = cw.equals("1") ? configService.selectConfigByKey("libang.customer.roleid") : configService.selectConfigByKey("libang.cw.roleid");
-//            list = wxMagnetMapper.selectMagnetByCw(userId, roleId);
-//        } else {
-//            list = wxMagnetMapper.selectMagnetByUserId(userId);
-//        }
         List<WxMagnet> list  = wxMagnetMapper.selectMagnetByUserId(userId,loginType);
         if(list!=null && list.size()>0){
             for(WxMagnet wxMagnet: list){
+
                 logger.info("isEncry::::"+wxMagnet.getIsEncry());
                 if("1".equals(wxMagnet.getIsEncry())){
                     String sapEmploeeId = this.wxMagnetMapper.selectSapEmploeeIdByUserId(userId);

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

@@ -7,7 +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="alias"     column="alias"      />
+        <result property="userType"     column="user_type"      />
         <result property="fatherMagnet"     column="father_magnet"      />
         <result property="orderNum"       column="order_num"      />
         <result property="url"            column="url"            />
@@ -26,7 +26,7 @@
     </resultMap>
 
     <sql id="selectMagnetVo">
-        select magnet_id, magnet_name, alias,father_magnet,order_num, url,  visible, magnet_size, bg_url ,remark, magnet_type, applet_qr_url, create_by, create_time
+        select magnet_id, magnet_name, user_type,father_magnet,order_num, url,  visible, magnet_size, bg_url ,remark, magnet_type, applet_qr_url, create_by, create_time
 		from wx_magnet
     </sql>
 
@@ -81,7 +81,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="alias != null and alias != ''">alias,</if>
+        <if test="userType != null and userType != ''">user_type,</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>
@@ -96,7 +96,7 @@
         )values(
         <if test="magnetId != null and magnetId != 0">#{magnetId},</if>
         <if test="magnetName != null and magnetName != ''">#{magnetName},</if>
-        <if test="alias != null and alias != ''">#{alias},</if>
+        <if test="userType != null and userType != ''">#{userType},</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>
@@ -115,7 +115,7 @@
         update wx_magnet
         <set>
             <if test="magnetName != null and magnetName != ''">magnet_name = #{magnetName},</if>
-            <if test="alias != null and alias != ''">alias = #{alias},</if>
+            <if test="userType != null and userType != ''">user_type = #{userType},</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>
@@ -137,7 +137,7 @@
     </select>
 
     <select id="selectMagnetAllByUserId"  resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.alias,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.user_type,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
@@ -181,7 +181,7 @@
     </insert>
 
     <select id="selectMagnetByUserId" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.alias,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id, m.magnet_name,m.user_type,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
@@ -203,7 +203,7 @@
     </select>
 
     <select id="selectWxMagnetRoleByUserId" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.alias,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.user_type,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
@@ -217,7 +217,7 @@
     </select>
 
     <select id="selectMagnetByCw" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.alias,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.user_type,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

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/java/com/dgtly/wxportal/controller/WxMagnetController.java

@@ -106,6 +106,19 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated WxMagnet wxMagnet)
     {
+        String newMagnetName = "";
+        String newOrderNum = "";
+        if ("0".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(立邦员工)";
+        }else if ("1".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(经销商)";
+        }else if ("2".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(服务商)";
+        }else if ("3".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(金牌店)";
+        }
+        wxMagnet.setMagnetName(newMagnetName);
+        wxMagnet.setOrderNum(newOrderNum);
         if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(wxMagnetService.checkMagnetNameUnique(wxMagnet)))
         {
             return error("新增磁贴'" + wxMagnet.getMagnetName() + "'失败，磁贴名称已存在");
@@ -134,6 +147,20 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated WxMagnet wxMagnet)
     {
+        String newMagnetName = "";
+        String newOrderNum = "";
+        // 根据用户类型设置磁铁名称和订单号前缀
+        if ("0".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(立邦员工)";
+        }else if ("1".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(经销商)";
+        }else if ("2".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(服务商)";
+        }else if ("3".equals(wxMagnet.getUserType())){
+            newMagnetName = newMagnetName + "(金牌店)";
+        }
+        wxMagnet.setMagnetName(newMagnetName);
+        wxMagnet.setOrderNum(newOrderNum);
         if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(wxMagnetService.checkMagnetNameUnique(wxMagnet)))
         {
             return error("修改磁贴'" + wxMagnet.getMagnetName() + "'失败，磁贴名称已存在");