提交代码

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

@@ -26,6 +26,9 @@ public class WxMagnet extends BaseEntity
     /** 菜单名称 */
     private String magnetName;
 
+    /** 磁贴别名 */
+    private String alias;
+
     /** 显示顺序 */
     private String orderNum;
 
@@ -66,6 +69,13 @@ 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)
     {

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

@@ -58,7 +58,7 @@ public interface WxMagnetMapper
      * @param magnetName 磁贴名称
      * @return 结果
      */
-    WxMagnet checkMagnetNameUnique(@Param("magnetName") String magnetName);
+    List<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();
-        WxMagnet info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName());
+        List<WxMagnet> info = wxMagnetMapper.checkMagnetNameUnique(wxMagnet.getMagnetName());
         if (StringUtils.isNotNull(info) && info.getMagnetId().longValue() != magnetId.longValue())
         {
             return UserConstants.MENU_NAME_NOT_UNIQUE;

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="alias"     column="alias"      />
         <result property="fatherMagnet"     column="father_magnet"      />
         <result property="orderNum"       column="order_num"      />
         <result property="url"            column="url"            />
@@ -25,7 +26,7 @@
     </resultMap>
 
     <sql id="selectMagnetVo">
-        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
+        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
 		from wx_magnet
     </sql>
 
@@ -80,6 +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="fatherMagnet != null and fatherMagnet != ''">father_magnet,</if>
         <if test="orderNum != null and orderNum != ''">order_num,</if>
         <if test="url != null and url != ''">url,</if>
@@ -94,6 +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="fatherMagnet != null and fatherMagnet != ''">#{fatherMagnet},</if>
         <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
         <if test="url != null and url != ''">#{url},</if>
@@ -112,6 +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="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>
@@ -133,7 +137,7 @@
     </select>
 
     <select id="selectMagnetAllByUserId"  resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.alias,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
@@ -177,7 +181,7 @@
     </insert>
 
     <select id="selectMagnetByUserId" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.alias,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
@@ -199,7 +203,7 @@
     </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
+        select distinct m.magnet_id,  m.magnet_name,m.alias,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
@@ -213,7 +217,7 @@
     </select>
 
     <select id="selectMagnetByCw" parameterType="String" resultMap="WxMagnetResult">
-        select distinct m.magnet_id,  m.magnet_name,m.father_magnet, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id,  m.magnet_name,m.alias,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