Merge branch 'feat-1002375' into 'master'

新增小号内部接口

See merge request rays/pcloud-book!418

pcloud-facade-book/src/main/java/com/pcloud/book/pcloudKeyword/dto/PcloudRobotDTO.java

+package com.pcloud.book.pcloudKeyword.dto;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("全平台关键词小号")
+public class PcloudRobotDTO extends BaseEntity {
+
+    @ApiModelProperty("微信id")
+    private String wxId;
+
+    @ApiModelProperty("昵称")
+    private String nickName;
+
+    @ApiModelProperty("头像")
+    private String head;
+
+    @ApiModelProperty("二维码url")
+    private String qrcodeUrl;
+
+    @ApiModelProperty("个人号类型")
+    private Integer robotType;
+
+    @ApiModelProperty("分类名称")
+    private String classifyName;
+
+    @ApiModelProperty("关键词分类ID")
+    private Long keywordClassifyId;
+
+    @ApiModelProperty("关键词分类名称")
+    private String keywordClassifyName;
+
+    @ApiModelProperty("入口二维码url")
+    private String entryQrcodeUrl;
+
+    @ApiModelProperty("小号分类id")
+    private String classifyId;
+
+    @ApiModelProperty("状态：1 在线 2 离线")
+    private Integer state;
+
+    @ApiModelProperty("缄默时长")
+    private Integer silenceDuration;
+
+    @ApiModelProperty("自动唤醒配置 1开启")
+    private Integer wakeUp;
+
+    @ApiModelProperty("编号")
+    private String uniqueNumber;
+}

pcloud-facade-book/src/main/java/com/pcloud/book/pcloudKeyword/service/PcloudRobotService.java

 package com.pcloud.book.pcloudKeyword.service;
 
+import com.pcloud.book.pcloudKeyword.dto.PcloudRobotDTO;
 import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
@@ -26,4 +27,12 @@ public interface PcloudRobotService {
     @GetMapping("getAllPcloudRobot")
     ResponseEntity<ResponseDto<List<RobotClassifyDTO>>> getAllPcloudRobot();
 
+    @ApiOperation(value = "新增个人号信息", httpMethod = "POST")
+    @PostMapping("addPcloudRobot")
+    void addPcloudRobot(@RequestBody PcloudRobotDTO pcloudRobotDTO);
+
+    @ApiOperation(value = "修改个人号信息", httpMethod = "POST")
+    @PostMapping("modifyPcloudRobot")
+    void modifyPcloudRobot(@RequestBody PcloudRobotDTO pcloudRobotDTO);
+
 }

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

@@ -17,6 +17,8 @@ public interface PcloudRobotBiz {
 
     void updatePcloudRobot(PcloudRobot pcloudRobot);
 
+    void updatePcloudRobotByWxId(PcloudRobot pcloudRobot);
+
     PageBeanNew<PcloudRobot> getPcloudRobotList(String nickName, Integer currentPage, Integer numPerPage);
 
     void batchUpdatePcloudRobotWelcome(List<PcloudRobotWelcome> robotWelcomeList);

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

@@ -135,6 +135,11 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
     }
 
     @Override
+    public void updatePcloudRobotByWxId(PcloudRobot pcloudRobot) {
+        pcloudRobotDao.updatePcloudRobotByWxId(pcloudRobot);
+    }
+
+    @Override
     @ParamLog
     public PageBeanNew<PcloudRobot> getPcloudRobotList(String nickName, Integer currentPage, Integer numPerPage) {
         if (currentPage == null || currentPage < 0 || numPerPage == null || numPerPage <= 0) {

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

@@ -28,4 +28,5 @@ public interface PcloudRobotDao extends BaseDao<PcloudRobot> {
      */
     PcloudRobot getByUniqueNumber(String uniqueNumber);
 
+    void updatePcloudRobotByWxId(PcloudRobot pcloudRobot);
 }

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

@@ -47,4 +47,9 @@ public class PcloudRobotDaoImpl extends BaseDaoImpl<PcloudRobot> implements Pclo
         return this.getSessionTemplate().selectOne(this.getStatement("getByUniqueNumber"), uniqueNumber);
     }
 
+    @Override
+    public void updatePcloudRobotByWxId(PcloudRobot pcloudRobot) {
+        this.getSessionTemplate().update(this.getStatement("updatePcloudRobotByWxId"), pcloudRobot);
+    }
+
 }

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

 package com.pcloud.book.pcloudkeyword.service.impl;
 
+import com.pcloud.book.pcloudKeyword.dto.PcloudRobotDTO;
 import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
 import com.pcloud.book.pcloudKeyword.service.PcloudRobotService;
 import com.pcloud.book.pcloudkeyword.biz.PcloudRobotBiz;
+import com.pcloud.book.pcloudkeyword.entity.PcloudRobot;
 import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.utils.BeanUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -30,4 +33,20 @@ public class PcloudRobotServiceImpl implements PcloudRobotService {
     public ResponseEntity<ResponseDto<List<RobotClassifyDTO>>> getAllPcloudRobot() {
         return ResponseHandleUtil.toResponse(pcloudRobotBiz.getAllPcloudRobot());
     }
+
+    @Override
+    @PostMapping("addPcloudRobot")
+    public void addPcloudRobot(@RequestBody PcloudRobotDTO pcloudRobotDTO) {
+        PcloudRobot pcloudRobot = new PcloudRobot();
+        BeanUtils.copyProperties(pcloudRobotDTO, pcloudRobot);
+        pcloudRobotBiz.createPcloudRobot(pcloudRobot);
+    }
+
+    @Override
+    @PostMapping("modifyPcloudRobot")
+    public void modifyPcloudRobot(@RequestBody PcloudRobotDTO pcloudRobotDTO) {
+        PcloudRobot pcloudRobot = new PcloudRobot();
+        BeanUtils.copyProperties(pcloudRobotDTO, pcloudRobot);
+        pcloudRobotBiz.updatePcloudRobotByWxId(pcloudRobot);
+    }
 }

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

@@ -82,6 +82,40 @@
         where id = #{id,jdbcType=INTEGER}
     </update>
 
+    <update id="updatePcloudRobotByWxId" parameterType="PcloudRobot">
+        update pcloud_robot
+        <set>
+            <if test="nickName != null">
+                nick_name = #{nickName,jdbcType=VARCHAR},
+            </if>
+            <if test="head != null">
+                head = #{head,jdbcType=VARCHAR},
+            </if>
+            <if test="qrcodeUrl != null">
+                qrcode_url = #{qrcodeUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="robotType != null">
+                robot_type = #{robotType,jdbcType=INTEGER},
+            </if>
+            <if test="keywordClassifyId != null">
+                keyword_classify_id = #{keywordClassifyId,jdbcType=BIGINT},
+            </if>
+            <if test="state != null">
+                state = #{state,jdbcType=INTEGER},
+            </if>
+            <if test="wakeUp != null">
+                wake_up = #{wakeUp,jdbcType=INTEGER},
+            </if>
+            <if test="uniqueNumber != null">
+                unique_number = #{uniqueNumber, jdbcType=VARCHAR},
+            </if>
+            <if test="welcomeDuration != null">
+                welcome_duration = #{welcomeDuration,jdbcType=INTEGER},
+            </if>
+        </set>
+        where wx_id = #{wxId,jdbcType=VARCHAR}
+    </update>
+
     <update id="updateState" parameterType="PcloudRobot">
         update pcloud_robot set
         state = #{state}