Merge branch 'feat-zdw-1002402' into 'master'

feat-1002402: 个人号分类加排序

See merge request rays/pcloud-book!429

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/PcloudRobotClassifyBiz.java

@@ -3,6 +3,7 @@ package com.pcloud.book.pcloudkeyword.biz;
 import com.pcloud.book.pcloudkeyword.dto.ClassifyWelcomeDTO;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO;
 import com.pcloud.common.page.PageBeanNew;
 
 import java.util.List;
@@ -43,4 +44,10 @@ public interface PcloudRobotClassifyBiz {
      */
     void updateRobotClassifyKeywordClassify(PcloudRobotClassify classify);
 
+    /**
+     * 修改分类排序值
+     * @param vo
+     */
+    void updateSeqNum4RobotClassify(ClassifySeqNumUpdateVO vo);
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/biz/impl/PcloudRobotClassifyBizImpl.java

@@ -10,6 +10,7 @@ import com.pcloud.book.pcloudkeyword.entity.PcloudRobotWelcome;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
 
 import com.pcloud.book.pcloudkeyword.set.PcloudRobotSet;
+import com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListUtils;
@@ -102,4 +103,10 @@ public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
         pcloudRobotClassifyDao.updateRobotClassifyKeywordClassify(classify.getId(),classify.getKeywordClassifyId());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSeqNum4RobotClassify(ClassifySeqNumUpdateVO vo) {
+        pcloudRobotClassifyDao.updateSeqNum4RobotClassify(vo);
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/PcloudRobotClassifyDao.java

@@ -2,6 +2,7 @@ package com.pcloud.book.pcloudkeyword.dao;
 
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO;
 import com.pcloud.common.core.dao.BaseDao;
 
 import java.util.List;
@@ -13,4 +14,10 @@ public interface PcloudRobotClassifyDao extends BaseDao<PcloudRobotClassify> {
     void updateRobotClassifyKeywordClassify(Long id, Long keywordClassifyId);
 
     void updateWelcomeDuration(Long id, Integer welcomeDuration,Integer isOpenPushH5url);
+
+    /**
+     * 修改分类排序值
+     * @param vo
+     */
+    void updateSeqNum4RobotClassify(ClassifySeqNumUpdateVO vo);
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/impl/PcloudRobotClassifyDaoImpl.java

@@ -3,6 +3,7 @@ package com.pcloud.book.pcloudkeyword.dao.impl;
 import com.pcloud.book.pcloudkeyword.dao.PcloudRobotClassifyDao;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 
 import org.springframework.stereotype.Component;
@@ -35,4 +36,9 @@ public class PcloudRobotClassifyDaoImpl extends BaseDaoImpl<PcloudRobotClassify>
         map.put("isOpenPushH5url",isOpenPushH5url);
         getSessionTemplate().update(getStatement("updateWelcomeDuration"),map);
     }
+
+    @Override
+    public void updateSeqNum4RobotClassify(ClassifySeqNumUpdateVO vo) {
+        getSessionTemplate().update(getStatement("updateSeqNum4RobotClassify"), vo);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/entity/PcloudRobotClassify.java

@@ -23,4 +23,7 @@ public class PcloudRobotClassify extends BaseEntity {
 
     @ApiModelProperty("关键词分类ID")
     private Long keywordClassifyId;
+
+    @ApiModelProperty("排序值")
+    private Integer seqNum;
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/facade/PcloudRobotClassifyFacade.java

 package com.pcloud.book.pcloudkeyword.facade;
 
+import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.pcloudkeyword.biz.PcloudRobotClassifyBiz;
 import com.pcloud.book.pcloudkeyword.dto.ClassifyWelcomeDTO;
 import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO;
 import com.pcloud.common.dto.ResponseDto;
 
 import com.pcloud.common.exceptions.BizException;
@@ -14,6 +16,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Resource;
 
@@ -82,4 +85,12 @@ public class PcloudRobotClassifyFacade {
         return new ResponseDto<>();
     }
 
+    @ApiOperation("更新小号分类排序值")
+    @PostMapping("updateSeqNum4RobotClassify")
+    public ResponseDto<?>  updateSeqNum4RobotClassify(@RequestHeader("token") String token, @RequestBody ClassifySeqNumUpdateVO vo) throws BizException, PermissionException {
+        Optional.ofNullable(vo).orElseThrow(() -> new BookBizException(BookBizException.ERROR, "参数不能为空"));
+        SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        pcloudRobotClassifyBiz.updateSeqNum4RobotClassify(vo);
+        return new ResponseDto<>();
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/facade/response/PcloudRobotClassifyResponseVO.java

@@ -19,4 +19,5 @@ public class PcloudRobotClassifyResponseVO {
 
     private Integer robotCount;
 
+    private Integer seqNum;
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/vo/ClassifySeqNumUpdateVO.java

+package com.pcloud.book.pcloudkeyword.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ClassifySeqNumUpdateVO {
+    @NotNull(message = "分类id不能为空")
+    private Long id;
+    @NotNull(message = "排序值不能为空")
+    private Integer seqNum;
+}

pcloud-service-book/src/main/resources/mapper/guide/PcloudRobotWakeupMapper.xml

@@ -133,6 +133,7 @@
     classify_name classifyName
     FROM pcloud_robot_classify WHERE id IN (SELECT DISTINCT robot_type FROM pcloud_robot )
     AND is_delete = 0
+    order by seq_num
   </select>
 
   <select id="getRobotWakeUpConfigListCount" resultType="integer">

pcloud-service-book/src/main/resources/mapper/pcloudkeyword/PcloudRobotClassify.Mapper.xml

@@ -10,17 +10,19 @@
     <result column="keyword_classify_id" property="keywordClassifyId" jdbcType="VARCHAR" />
       <result column="welcome_duration" property="welcomeDuration" jdbcType="INTEGER" />
       <result column="is_open_push_h5url" property="isOpenPushH5url" jdbcType="INTEGER" />
+      <result column="seq_num" property="seqNum" jdbcType="INTEGER"/>
   </resultMap>
 
     <resultMap id="pageResultMap" type="com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO" >
         <id column="id" property="id" jdbcType="INTEGER" />
         <result column="classify_name" property="classifyName" jdbcType="VARCHAR" />
         <result column="qrcode_url" property="qrcodeUrl" jdbcType="VARCHAR" />
+        <result column="seq_num" property="seqNum" jdbcType="INTEGER"/>
         <association property="robotCount" column="id" fetchType="eager"
                      select="com.pcloud.book.pcloudkeyword.dao.impl.PcloudRobotDaoImpl.getRobotCountByClassifyId" />
     </resultMap>
   <sql id="Base_Column_List" >
-    id, classify_name, link_url, qrcode_url,keyword_classify_id, is_delete, welcome_duration,is_open_push_h5url
+    id, classify_name, link_url, qrcode_url,keyword_classify_id, is_delete, welcome_duration,is_open_push_h5url, seq_num
   </sql>
 
   <insert id="insert" parameterType="com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify" useGeneratedKeys="true" keyProperty="id">
@@ -60,6 +62,7 @@
         select
         id, classify_name as classifyName
         from pcloud_robot_classify where is_delete = 0
+        order by seq_num
     </select>
 
     <select id="getById" parameterType="long" resultMap="BaseResultMap">
@@ -69,9 +72,10 @@
 
     <select id="listClassifyByPage" resultMap="pageResultMap">
         select
-        id, classify_name, qrcode_url
+        id, classify_name, qrcode_url, seq_num
         from pcloud_robot_classify
         where is_delete = 0
+        order by seq_num
     </select>
 
     <update id="updateRobotClassifyKeywordClassify" parameterType="map">
@@ -87,4 +91,8 @@
         where id=#{id}
     </update>
 
+    <update id="updateSeqNum4RobotClassify" parameterType="com.pcloud.book.pcloudkeyword.vo.ClassifySeqNumUpdateVO">
+        update pcloud_robot_classify
+        set seq_num = #{seqNum} where id = #{id}
+    </update>
 </mapper>
\ No newline at end of file