修改出车bug

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/RandomListDto.java

@@ -20,4 +20,14 @@ public class RandomListDto {
      */
     private Integer location;
 
+    /**
+     * 新闻类型
+     */
+    private Integer newsType;
+
+    /**
+     * 新闻id
+     */
+    private  Integer newsId;
+
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

@@ -77,18 +77,18 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
      * @param id
      * @return
      */
-    public List getThree( Integer type,Integer id) {
-
+    public List getThree( Integer type, Integer number, Integer id) {
+        number = number == null ? RANDOM_NUMBER : number;
         List<Article> articleList = mapper.getArticleList(type,null,id);
         if (!Objects.isNull(articleList)) {
             int size = articleList.size();
-            if (RANDOM_NUMBER >= size) {
+            if (number >= size) {
                 return articleList;
             } else {
                 Random random = new Random();
-                int r = random.nextInt(size - RANDOM_NUMBER + 1);
+                int r = random.nextInt(size - number + 1);
                 List<Article> result = new ArrayList<>();
-                for (int i = 0; i < RANDOM_NUMBER.intValue(); i++) {
+                for (int i = 0; i < number.intValue(); i++) {
                     int index = i + r;
                     result.add(articleList.get(index));
                 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/RandomListBiz.java

@@ -37,7 +37,7 @@ public class RandomListBiz {
      * @param number 随机数，默认是2
      * @return
      */
-    public ObjectRestResponse getRandomList(Integer type, Integer number, Integer location) {
+    public ObjectRestResponse getRandomList(Integer type, Integer number, Integer location, Integer id, Integer newsType) {
         if(type != null) {
             number = number == null ? 2 : number;
             switch (TypeEnum.getByValue(type)) {
@@ -50,7 +50,7 @@ public class RandomListBiz {
                 case ACTIVITY:
                     return ObjectRestResponse.succ(summitActivityBiz.getHostWithSummitActivity(number, location));
                 case NEWS:
-
+                    return ObjectRestResponse.succ(articleBiz.getThree(type, number, id));
             }
         }
         return ObjectRestResponse.succ();

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/RandomListController.java

@@ -19,7 +19,7 @@ public class RandomListController {
         if(randomListDto == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return randomListBiz.getRandomList(randomListDto.getType(), randomListDto.getNumber(), randomListDto.getLocation());
+        return randomListBiz.getRandomList(randomListDto.getType(), randomListDto.getNumber(), randomListDto.getLocation(), randomListDto.getNewsId(), randomListDto.getNewsType());
     }
 
 }