Merge branch 'feat-robotClassify' into 'master'

1002323 个人号分类是后端返回

See merge request rays/pcloud-book!374

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

+package com.pcloud.book.pcloudkeyword.biz;
+
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
+import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+
+import java.util.List;
+
+public interface PcloudRobotClassifyBiz {
+
+    /**
+     * 查询所有小号分类
+     */
+    List<PcloudRobotClassifyResponseVO> listAllRobotClassify();
+
+    /**
+     * 新增分类
+     */
+    void saveRobotClassify(String classifyName);
+
+    /**
+     * 修改分类
+     */
+    void updateRobotClassify(PcloudRobotClassify classify);
+
+}

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

+package com.pcloud.book.pcloudkeyword.biz.impl;
+
+import com.pcloud.book.pcloudkeyword.biz.PcloudRobotClassifyBiz;
+import com.pcloud.book.pcloudkeyword.dao.PcloudRobotClassifyDao;
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
+import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+@Service
+public class PcloudRobotClassifyBizImpl implements PcloudRobotClassifyBiz {
+
+    @Resource
+    private PcloudRobotClassifyDao pcloudRobotClassifyDao;
+
+    @Override
+    public List<PcloudRobotClassifyResponseVO> listAllRobotClassify() {
+        return pcloudRobotClassifyDao.listAllRobotClassify();
+    }
+
+    @Override
+    public void saveRobotClassify(String classifyName) {
+        PcloudRobotClassify classify = new PcloudRobotClassify();
+        classify.setClassifyName(classifyName);
+        classify.setIsDelete(0);
+        pcloudRobotClassifyDao.insert(classify);
+    }
+
+    @Override
+    public void updateRobotClassify(PcloudRobotClassify classify) {
+        pcloudRobotClassifyDao.update(classify);
+    }
+
+}

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

+package com.pcloud.book.pcloudkeyword.dao;
+
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
+import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.util.List;
+
+public interface PcloudRobotClassifyDao extends BaseDao<PcloudRobotClassify> {
+
+    List<PcloudRobotClassifyResponseVO> listAllRobotClassify();
+
+}

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

+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.common.core.dao.BaseDaoImpl;
+
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class PcloudRobotClassifyDaoImpl extends BaseDaoImpl<PcloudRobotClassify> implements PcloudRobotClassifyDao {
+
+    @Override
+    public List<PcloudRobotClassifyResponseVO> listAllRobotClassify() {
+        return this.getSqlSession().selectList("listAllRobotClassify");
+    }
+}

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

@@ -26,6 +26,9 @@ public class PcloudRobot extends BaseEntity {
     @ApiModelProperty("个人号类型")
     private Integer robotType;
 
+    @ApiModelProperty("分类名称")
+    private String classifyName;
+
     @ApiModelProperty("关键词分类ID")
     private Long keywordClassifyId;
 

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

+package com.pcloud.book.pcloudkeyword.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+
+public class PcloudRobotClassify extends BaseEntity {
+
+    private static final long serialVersionUID = -7926050288611663469L;
+    private String classifyName;
+
+    private Integer isDelete;
+
+    public String getClassifyName() {
+        return classifyName;
+    }
+
+    public void setClassifyName(String classifyName) {
+        this.classifyName = classifyName;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+}

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

+package com.pcloud.book.pcloudkeyword.facade;
+
+import com.pcloud.book.pcloudkeyword.biz.PcloudRobotClassifyBiz;
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify;
+import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.common.dto.ResponseDto;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("pcloudRobotClassify")
+public class PcloudRobotClassifyFacade {
+
+    @Resource
+    private PcloudRobotClassifyBiz pcloudRobotClassifyBiz;
+
+    @GetMapping("listClassify")
+    public ResponseDto<List<PcloudRobotClassifyResponseVO>> listClassify() {
+        List<PcloudRobotClassifyResponseVO> classify = pcloudRobotClassifyBiz.listAllRobotClassify();
+        return new ResponseDto<>(classify);
+    }
+
+    @PostMapping("saveRobotClassify")
+    public ResponseDto<Void> saveRobotClassify(@RequestParam("classifyName") String classifyName) {
+        pcloudRobotClassifyBiz.saveRobotClassify(classifyName);
+        return new ResponseDto<>();
+    }
+
+    @PostMapping("updateRobotClassify")
+    public ResponseDto<Void> updateRobotClassify(@RequestBody PcloudRobotClassify classify) {
+        pcloudRobotClassifyBiz.updateRobotClassify(classify);
+        return new ResponseDto<>();
+    }
+
+}

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

+package com.pcloud.book.pcloudkeyword.facade.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PcloudRobotClassifyResponseVO {
+
+    private Long id;
+
+    private String classifyName;
+
+}

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

@@ -76,15 +76,25 @@
         from pcloud_robot where id=#{id}
     </select>
 
-    <select id="getPcloudRobotList" parameterType="map" resultMap="BaseResultMap">
+    <select id="getPcloudRobotList" parameterType="map" resultType="PcloudRobot">
         SELECT
-            <include refid="Base_Column_List"/>
+        r.id id,
+        r.wx_id wxId,
+        r.nick_name nickName,
+        r.head head,
+        r.qrcode_url qrcodeUrl,
+        r.robot_type robotType,
+        r.keyword_classify_id keywordClassifyId,
+        r.state state,
+        rc.classify_name classifyName
         FROM
-            pcloud_robot
+            pcloud_robot r
+        left join pcloud_robot_classify rc
+        on r.robot_type = rc.id
         WHERE
             1=1
         <if test="nickName!=null">
-            and nick_name like concat('%', #{nickName}, '%')
+            and r.nick_name like concat('%', #{nickName}, '%')
         </if>
     </select>
 

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pcloud.book.pcloudkeyword.dao.impl.PcloudRobotClassifyDaoImpl" >
+  <resultMap id="BaseResultMap" type="com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="classify_name" property="classifyName" jdbcType="VARCHAR" />
+    <result column="is_delete" property="isDelete" jdbcType="INTEGER" />
+
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, classify_name, is_delete
+  </sql>
+
+  <insert id="insert" parameterType="com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify" useGeneratedKeys="true" keyProperty="id">
+    insert into pcloud_robot_classify (
+        classify_name,
+        is_delete
+      )
+    values (
+      #{classifyName,jdbcType=VARCHAR},
+      #{isDelete,jdbcType=INTEGER}
+      )
+  </insert>
+
+    <update id="update" parameterType="com.pcloud.book.pcloudkeyword.entity.PcloudRobotClassify">
+        update pcloud_robot set
+        classify_name = #{classifyName}
+        is_delete = #{isDelete}
+        where id=#{id}
+    </update>
+
+    <select id="listAllRobotClassify" resultType="com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO">
+        select
+        id, classify_name as classifyName
+        from pcloud_robot_classify where is_delete = 0
+    </select>
+
+</mapper>
\ No newline at end of file