青雲慧改造

renren-admin/src/main/java/io/renren/modules/qyh/api/ApiNewsController.java

@@ -31,7 +31,6 @@ public class ApiNewsController extends AbstractController {
 
     @GetMapping("/page")
     @ApiOperation("分页")
-    @RequiresPermissions("qyh:news:list")
     public R page(@RequestParam Map<String, Object> params) {
         PageUtils page = newsService.queryPage(params);
         return R.ok().put("page", page);
@@ -45,7 +44,6 @@ public class ApiNewsController extends AbstractController {
 
     @GetMapping("/info/{id}")
     @ApiOperation("信息")
-    @RequiresPermissions("qyh:news:info")
     public R info(@PathVariable("id") Long id) {
         NewsEntity news = newsService.getById(id);
         if (ObjectUtil.isNotNull(news)){

renren-admin/src/main/java/io/renren/modules/qyh/entity/NewsEntity.java

@@ -61,6 +61,16 @@ public class NewsEntity implements Serializable {
 	 */
 	private Integer sortNo;
 
+	/**
+	 * 简介
+	 */
+	private String introduction;
+
+	/**
+	 * 文件
+	 */
+	private String fileUrl;
+
 	/**
 	 * 创建人
 	 */

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/NewsServiceImpl.java

@@ -32,11 +32,15 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, NewsEntity> impleme
     public PageUtils queryPage(Map<String, Object> params) {
         Integer status = MapUtil.getInt(params, "status");
         String title = MapUtil.getStr(params, "title");
+        String publishStartTime = MapUtil.getStr(params, "publishStartTime");
+        String publishEndTime = MapUtil.getStr(params, "publishEndTime");
         IPage<NewsEntity> page = this.page(new Query<NewsEntity>().getPage(params),
                 new LambdaQueryWrapper<NewsEntity>()
                         .eq(ObjectUtil.isNotNull(status), NewsEntity::getStatus, status)
                         .like(StrUtil.isNotBlank(title), NewsEntity::getTitle, title)
                         .eq(NewsEntity::getIsDelete, IsDeleteEnum.NORMAL.value())
+                        .between(ObjectUtil.isNotNull(publishStartTime) && ObjectUtil.isNotNull(publishEndTime),
+                                NewsEntity::getPublishTime, publishStartTime, publishEndTime)
                         .orderByDesc(NewsEntity::getCreateTime));
         return new PageUtils(page);
     }

renren-admin/src/main/resources/mapper/qyh/NewsDao.xml

@@ -12,6 +12,10 @@
         <result property="status" column="status"/>
         <result property="hits" column="hits"/>
         <result property="sortNo" column="sort_no"/>
+        <result property="hits" column="hits"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="introduction" column="introduction"/>
+        <result property="fileUrl" column="file_url"/>
         <result property="createId" column="create_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateId" column="update_id"/>