同步修改群分类的关键词顺序

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -357,7 +357,14 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         bookKeyword.setId(setRankVO.getBookKeywordId());
         bookKeyword.setRank(setRankVO.getRank());
         bookKeyword.setUpdateUser(partyId);
-        bookKeywordDao.setRank(bookKeyword);
+        KeywordVO byBookKeyword = bookKeywordDao.getByBookKeyword(setRankVO.getBookKeywordId());
+        if (byBookKeyword != null && (byBookKeyword.getClassifyId() == null || byBookKeyword.getClassifyId() == 0)){
+            Long bookGroupId = byBookKeyword.getBookGroupId();
+            Long keywordId = byBookKeyword.getKeywordId();
+            bookKeywordDao.updateRank(bookGroupId,setRankVO.getRank(),partyId,keywordId);
+        }else {
+            bookKeywordDao.setRank(bookKeyword);
+        }
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/BookKeywordDao.java

@@ -103,4 +103,11 @@ public interface BookKeywordDao extends BaseDao<BookKeyword> {
     * @date 2019/7/16 17:18
     */
     void deleteKeywords(Long keywordId, Long bookGroupId, Long classifyId, Long partyId);
+
+    /**
+    * @description 根据书调整关键词顺序
+    * @author 戴兴
+    * @date 2019/9/11 17:24
+    */
+    void updateRank(Long bookGroupId, Integer rank, Long partyId, Long keywordId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/impl/BookKeywordDaoImpl.java

@@ -134,4 +134,14 @@ public class BookKeywordDaoImpl extends BaseDaoImpl<BookKeyword> implements Book
         paramMap.put("partyId", partyId);
         this.getSqlSession().update(this.getStatement("deleteKeywords"), paramMap);
     }
+
+    @Override
+    public void updateRank(Long bookGroupId, Integer rank, Long partyId, Long keywordId) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("rank", rank);
+        paramMap.put("bookGroupId", bookGroupId);
+        paramMap.put("partyId", partyId);
+        paramMap.put("keywordId", keywordId);
+        this.getSqlSession().update(this.getStatement("updateRank"), paramMap);
+    }
 }

pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml

@@ -130,7 +130,7 @@
         <if test="keywords!=null">
             AND keywords like concat('%', #{keywords}, '%')
         </if>
-        order by bk.rank ASC, bk.id DESC
+        order by bk.rank ASC, bk.update_time desc, bk.id DESC
     </select>
 
     <select id="listFiveKeyword" resultType="keywordDTO" parameterType="map">
@@ -344,6 +344,18 @@
         and book_group_id = #{bookGroupId,jdbcType=BIGINT}
         and classify_id = #{classifyId,jdbcType=BIGINT}
     </update>
+
+    <update id="updateRank" parameterType="map">
+        update book_keyword
+        <set>
+            rank = #{rank},
+            update_user = #{partyId},
+            update_time = now()
+        </set>
+        where keyword_id = #{keywordId,jdbcType=BIGINT}
+        and book_group_id = #{bookGroupId,jdbcType=BIGINT}
+        and is_delete = 0
+    </update>
     
     <select id="getServiceByWeixinGroup" parameterType="map" resultType="com.pcloud.book.keywords.dto.ServiceResourceDTO">
         SELECT