Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/service/radio/WlyyRadioService.java

@@ -47,7 +47,7 @@ public class WlyyRadioService extends BaseJpaService<WlyyRadioDO, WlyyRadioDao>
        if(StringUtils.isNotBlank(frequency)){
            sql += " and frequency like '%"+frequency+"%' ";
        }
        String orderSql = " order by sort_num limit "+page*pageSize+","+pageSize;
        String orderSql = " order by sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql+sql+orderSql);
        String countSql = "SELECT count(*) ";
        Long count = jdbcTemplate.queryForObject(countSql+sql, Long.class);

svr/svr-base/src/main/java/com/yihu/jw/base/service/video/BaseVideoGroupService.java

@@ -47,7 +47,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
        if(StringUtils.isNotBlank(name)){
            sql += " and name like '%"+name+"%' ";
        }
        String orderSql = " ORDER BY sort_num limit "+page*pageSize+","+pageSize;
        String orderSql = " ORDER BY sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql + sql + orderSql);
        Long count = jdbcTemplate.queryForObject(countSql + sql, Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
@@ -112,7 +112,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
            fromSql += " and v.type = "+type;
        }
        Long count = jdbcTemplate.queryForObject(countSql + fromSql, Long.class);
        fromSql += " order by v.sort_num limit "+page*pageSize+","+pageSize;
        fromSql += " order by v.sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql + fromSql);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/radio/WlyyRadioService.java

@@ -40,7 +40,7 @@ public class WlyyRadioService {
        if(StringUtils.isNotBlank(frequency)){
            sql += " and frequency like '%"+frequency+"%' ";
        }
        String orderSql = " order by sort_num limit "+page*pageSize+","+pageSize;
        String orderSql = " order by sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql+sql+orderSql);
        String countSql = "SELECT count(*) ";
        Long count = jdbcTemplate.queryForObject(countSql+sql, Long.class);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/video/BaseVideoService.java

@@ -28,7 +28,7 @@ public class BaseVideoService {
        String sql = "SELECT id,name,sort_num sortNum,CAST(status as UNSIGNED) status," +
                " CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) createTime " +
                " from base_video_group " +
                " where status = 1 order by sort_num ";
                " where status = 1 order by sort_num desc ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return ListEnvelop.getSuccess("查询成功",list);
    }
@@ -53,7 +53,7 @@ public class BaseVideoService {
            sql += " and v.type = "+groupId+" ";
        }
        Long count = jdbcTemplate.queryForObject(countSql + sql, Long.class);
        sql += " order by v.sort_num limit "+page*pageSize+","+pageSize;
        sql += " order by v.sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql + sql);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
    }