Merge branch 'zyj-fixbug' into 'master'

fixbug

See merge request rays/pcloud-book!449

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

@@ -5,11 +5,13 @@ import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
 import com.pcloud.common.dto.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 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.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -35,4 +37,7 @@ public interface PcloudRobotService {
     @PostMapping("modifyPcloudRobot")
     void modifyPcloudRobot(@RequestBody PcloudRobotDTO pcloudRobotDTO);
 
+    @ApiOperation("根据小号类别获取小号")
+    @GetMapping("getPcloudRobotByType")
+    public ResponseEntity<ResponseDto<List<String>>> getPcloudRobotByType(@RequestParam("robotType") @ApiParam("小号分类") Long robotType);
 }

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

@@ -97,4 +97,6 @@ public interface PcloudRobotBiz {
      * 生成应用/作品链接
      */
     public String generateLinkbyAppProduct(String link, Long serveId, String serveType, String userWxId, String robotId);
+
+    List<String> getPcloudRobotByTypes(List<Integer> classifyIds);
 }

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

@@ -773,4 +773,8 @@ public class PcloudRobotBizImpl implements PcloudRobotBiz {
         return resultUrl;
     }
 
+    @Override
+    public List<String> getPcloudRobotByTypes(List<Integer> classifyIds){
+        return pcloudRobotDao.getPcloudRobotByTypes(classifyIds);
+    }
 }

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -49,4 +50,12 @@ public class PcloudRobotServiceImpl implements PcloudRobotService {
         BeanUtils.copyProperties(pcloudRobotDTO, pcloudRobot);
         pcloudRobotBiz.updatePcloudRobotByWxId(pcloudRobot);
     }
+    @Override
+    @GetMapping("getPcloudRobotByType")
+    public ResponseEntity<ResponseDto<List<String>>>getPcloudRobotByType(@RequestParam("robotType") Long robotType){
+        Integer type = robotType.intValue();
+        List<String> allRobot = pcloudRobotBiz.getPcloudRobotByTypes(Arrays.asList(type));
+        return ResponseHandleUtil.toResponse(allRobot);
+    }
+
 }