Merge remote-tracking branch 'origin/dev' into dev

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

@@ -24,7 +24,7 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     /**
      * 随机文章条数
      */
-    private final Integer RANDOM_NUMBER = 3;
+    private final Integer RANDOM_NUMBER = 2;
 
     /**
      * 首页文章条数
@@ -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/ArticleController.java

@@ -37,15 +37,19 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
     }
 
     /**
-     *
+     * 随机获取三条数据
      * @param type
-     * @param id 当前文章id
+     * @param number
+     * @param id
      * @return
      */
-    @GetMapping("/app/unauth/three/{type}/{id}")
+    @GetMapping("/app/unauth/three")
     @ApiOperation(value = "随机获取三条数据")
-    public ObjectRestResponse randomAccessToThreeData(@PathVariable Integer type,@PathVariable Integer id){
-        return ObjectRestResponse.succ(baseBiz.getThree(type,id));
+    public ObjectRestResponse randomAccessToThreeData(@RequestParam("type") Integer type,
+                                                      @RequestParam("number") Integer number,
+                                                      @RequestParam("id") Integer id
+                                                      ){
+        return ObjectRestResponse.succ(baseBiz.getThree(type,number,id));
     }
 
     @GetMapping("/app/unauth/homePage/{type}")

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());
     }
 
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -195,21 +195,26 @@ public class SmsService {
        try {
            JSONObject jsonParams=new JSONObject();
            for (int i=0;i<params.length;i++){
-               jsonParams.put(param+(i+1),params[i]);
+               String para=params[i];
+               if (para.contains("【")){
+                   para=para.replaceAll("【","");
+               }
+               if (para.contains("】")){
+                   para=para.replaceAll("】","");
+               }
+               jsonParams.put(param+(i+1),para);
            }
-
            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
        }catch (Exception e){
            e.printStackTrace();
        }
 
-
     }
 
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService smsService=new SmsService();
         //发短信
-        String[] params={"1","2","3","2019-08-29","松山湖"};
+        String[] params={"1","2","3","2019-08-29","【松山湖】"};
         SmsService.sendTemplateToJson("13612688539,13265487972",params,"SMS_169904346");
         /*System.out.println("短信接口返回的数据----------------");
         System.out.println("Code=" + response.getCode());

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -677,6 +677,8 @@
             and v.is_del = 0
             and v.status != 3
             and v.use_type = 1
+            and bc.is_del = 0
+            and bc.is_show = 1
         </where>
     </sql>