Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/HotFollowController.java

@@ -3,6 +3,7 @@ package io.office.modules.manage.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.utils.PageUtils;
 import io.office.common.utils.R;
+import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.TopicnewsEntity;
 import io.office.modules.manage.entity.dto.NewsParams;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author rkl
@@ -111,4 +113,21 @@ public class HotFollowController extends AbstractController {
             return R.error(e.getMessage());
         }
     }
+
+
+    /**
+     * 资讯中心查看
+     */
+
+    @Login
+    @GetMapping("/api/hotFollowList")
+    // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
+    public R getDetail(@RequestParam Map<String,Object> params) {
+//        newsParams.setClassId(435);
+//        Page<NewsEntity> page = this.topicnewsService.selectTopicList(newsParams,
+//                new Page(newsParams.getPage(),newsParams.getLimit()));
+//        PageUtils pageUtils = new PageUtils(page);
+//        return R.ok().put("page", pageUtils);
+        return null;
+    }
 }

src/main/java/io/office/modules/manage/controller/NewsController.java

@@ -52,6 +52,8 @@ public class NewsController extends AbstractController {
     //  @RequiresPermissions("manage:news:info")
     public R info(@PathVariable("id") Integer id) {
         NewsEntity news = newsService.getById(id);
+        String name = this.newsService.selectClassName(news.getClassid());
+        news.setClassName(name);
         return R.ok().put("news", news);
     }
 
@@ -139,17 +141,14 @@ public class NewsController extends AbstractController {
     /**
      * 资讯中心
      */
-
     @Login
     @PostMapping("/api/realTimeInfo")
-    // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
-    public R realTimeInfo(@RequestParam Map<String, Object> params) {
-        try {
-            return R.ok().put("data", newsService.selectRealTimeInfo(params));
-        } catch (Exception e) {
-            log.error("realTimeInfo error:", e);
-            return R.error(e.getMessage());
-        }
+    // @RequiresPermissions("manage:news:list")
+    public R realTimeInfo(@RequestBody NewsParams newsParams) {
+        Page<NewsEntity> page = this.newsService.selectRealTimeInfo(newsParams,
+                new Page(newsParams.getPage(), newsParams.getLimit()));
+        PageUtils pageUtils = new PageUtils(page);
+        return R.ok().put("page", pageUtils);
     }
 
     /**

src/main/java/io/office/modules/manage/controller/NewtopicController.java

@@ -72,7 +72,7 @@ public class NewtopicController extends AbstractController {
     // @RequiresPermissions("manage:newtopic:save")
     public R save(@RequestBody NewtopicEntityVo newtopicVo) {
         newtopicService.insert(newtopicVo, getUser());
-        return R.ok();
+        return R.ok("新增成功");
     }
 
     /**
@@ -124,7 +124,7 @@ public class NewtopicController extends AbstractController {
         QueryWrapper<NewtopicEntity> newtopicEntityQueryWrapper = new QueryWrapper<>();
         newtopicEntityQueryWrapper.eq("classid",newtopicEntity.getClassid());
         newtopicService.update(newtopicEntity,newtopicEntityQueryWrapper);
-        return R.ok();
+        return R.ok("审核通过!");
     }
 
 

src/main/java/io/office/modules/manage/controller/PictureController.java

@@ -5,13 +5,17 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.utils.PageUtils;
+import io.office.common.utils.Query;
 import io.office.common.utils.R;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.IndexCarouselManageEntity;
+import io.office.modules.manage.entity.MedicalEntity;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.PictureEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PictureParams;
 import io.office.modules.manage.service.PictureService;
 import io.office.modules.sys.controller.AbstractController;
@@ -145,18 +149,12 @@ public class PictureController extends AbstractController {
     @Login
     @PostMapping("/api/pictureList")
     // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
-    public R pictureList() {
+    public R pictureList(@RequestBody NewsParams params) {
         try {
-            QueryWrapper<PictureEntity> newsEntityQueryWrapper = new QueryWrapper<>();
-            newsEntityQueryWrapper.eq("status","1");
-            newsEntityQueryWrapper.gt("PicLevel","0");
-            newsEntityQueryWrapper.orderByDesc("PicLevel");
-            newsEntityQueryWrapper.orderByDesc("showtime");
-            newsEntityQueryWrapper.orderByDesc("inputDate");
-            newsEntityQueryWrapper.orderByDesc("pictureID");
-
-            List<PictureEntity> list = pictureService.list(newsEntityQueryWrapper);
-            return R.ok().put("data", list);
+            Page<PictureEntity> page = this.pictureService.selectPictureNewList(params,
+                    new Page(params.getPage(),params.getLimit()));
+            PageUtils  pageUtils = new PageUtils(page);
+            return R.ok().put("page", pageUtils);
         } catch (Exception e) {
             log.error("pictureList error:", e);
             return R.error(e.getMessage());

src/main/java/io/office/modules/manage/controller/PolicyController.java

 package io.office.modules.manage.controller;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +9,7 @@ import io.office.common.utils.R;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.entity.PictureEntity;
 import io.office.modules.manage.entity.PolicyEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PolicyParams;
 import io.office.modules.manage.service.PolicyService;
 import io.office.modules.sys.controller.AbstractController;
@@ -139,20 +139,28 @@ public class PolicyController extends AbstractController {
     @Login
     @PostMapping("/api/policyList")
     // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
-    public R policyList() {
-        try {
-            QueryWrapper<PolicyEntity> policyEntityQueryWrapper = new QueryWrapper<>();
-            policyEntityQueryWrapper.eq("class","法律法规");
-            policyEntityQueryWrapper.gt("levels","0");
-            policyEntityQueryWrapper.eq("status ","1");
-            policyEntityQueryWrapper.orderByDesc("levels");
-            policyEntityQueryWrapper.orderByDesc("releasedate ");
-            policyEntityQueryWrapper.orderByDesc("id");
-            return R.ok().put("data",policyService.list(policyEntityQueryWrapper));
-        } catch (Exception e) {
-            log.error("policyList error: {}", e);
-            return R.error(e.getMessage());
-        }
+    public R policyList(@RequestBody NewsParams params) {
+//        try {
+//            QueryWrapper<PolicyEntity> policyEntityQueryWrapper = new QueryWrapper<>();
+//            policyEntityQueryWrapper.eq("class","法律法规");
+//            policyEntityQueryWrapper.gt("levels","0");
+//            policyEntityQueryWrapper.eq("status ","1");
+//            policyEntityQueryWrapper.orderByDesc("levels");
+//            policyEntityQueryWrapper.orderByDesc("releasedate ");
+//            policyEntityQueryWrapper.orderByDesc("id");
+//            List<PolicyEntity> list = policyService.policyListN(policyEntityQueryWrapper);
+//            Page<PolicyEntity> page = new Page(params.getPage(),params.getLimit());
+//            page.setRecords(list);
+//            PageUtils  pageUtils = new PageUtils(page);
+//            return R.ok().put("data",pageUtils);
+//        } catch (Exception e) {
+//            log.error("policyList error: {}", e);
+//            return R.error(e.getMessage());
+//        }
+        Page<PolicyEntity> page = this.policyService.selectPolicyNewList(params,
+                new Page(params.getPage(),params.getLimit()));
+        PageUtils  pageUtils = new PageUtils(page);
+        return R.ok().put("page", pageUtils);
     }
 
     @Login

src/main/java/io/office/modules/manage/controller/TopicnewsController.java

@@ -37,6 +37,7 @@ public class TopicnewsController extends AbstractController {
     @RequestMapping("/list")
 //    @RequiresPermissions("generator:topicnews:list")
     public R list(@RequestBody NewsParams newsParams){
+        newsParams.setClassId(428);
         Page<NewsEntity> page = this.topicnewsService.selectTopicList(newsParams,
                 new Page(newsParams.getPage(),newsParams.getLimit()));
         PageUtils  pageUtils = new PageUtils(page);
@@ -62,6 +63,7 @@ public class TopicnewsController extends AbstractController {
 //    @RequiresPermissions("generator:topicnews:save")
     public R save(@RequestBody NewsEntity news){
         try {
+            news.setClassid(428);
             R r = this.topicnewsService.insertHdbd(news, getUser());
             return r;
         } catch (Exception e) {
@@ -128,5 +130,15 @@ public class TopicnewsController extends AbstractController {
         }
     }
 
+    @Login
+    @PostMapping("/api/getHdbdList")
+    // @RequiresPermissions("generator:indexcarouselmanage:pictureImageList")
+    public R getHdbdList(@RequestBody NewsParams newsParams) {
+        Page<NewsEntity> page = this.topicnewsService.getHdbdList(newsParams,
+                new Page(newsParams.getPage(),newsParams.getLimit()));
+        PageUtils  pageUtils = new PageUtils(page);
+        return R.ok().put("page", pageUtils);
+    }
+
 
 }

src/main/java/io/office/modules/manage/dao/NewsDao.java

@@ -30,5 +30,9 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
      */
     List<NewsEntity> selectNewsListCondition(@Param("newsEntity") NewsEntity newsEntity);
 
-    List<NewsEntity> selectRealTimeInfo(Map<String, Object> params);
+    List<NewsEntity> selectRealTimeInfo(@Param("newsParams")NewsParams newsParams, Page page);
+
+    List<NewsEntity> getHdbdList(@Param("newsParams")NewsParams newsParams, Page page);
+
+    String selectClassName(Integer classid);
 }

src/main/java/io/office/modules/manage/dao/PictureDao.java

@@ -3,6 +3,7 @@ package io.office.modules.manage.dao;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.manage.entity.PictureEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PictureParams;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +21,6 @@ import java.util.List;
 public interface PictureDao extends BaseMapper<PictureEntity> {
 
     List<PictureEntity> selectPictureList(@Param("params") PictureParams params, Page page);
+
+    List<PictureEntity> selectPictureNewList(@Param("params")NewsParams params, Page page);
 }

src/main/java/io/office/modules/manage/dao/PolicyDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.PolicyEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PolicyParams;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,6 @@ import java.util.List;
 public interface PolicyDao extends BaseMapper<PolicyEntity> {
 
     List<NewsEntity> selectPolicyList(@Param("newsParams") PolicyParams params, Page page);
+
+    List<PolicyEntity> selectPolicyNewList(@Param("newsParams")NewsParams params, Page page);
 }

src/main/java/io/office/modules/manage/entity/NewsEntity.java

@@ -129,5 +129,7 @@ public class NewsEntity implements Serializable {
 	 * $column.comments
 	 */
 	private Date checkdate;
+	@TableField(exist = false)
+	private String className;
 
 }

src/main/java/io/office/modules/manage/service/NewsService.java

@@ -33,6 +33,8 @@ public interface NewsService extends IService<NewsEntity> {
 
     List<NewsEntity> selectNewsListCondition(NewsEntity newsEntity);
 
-    List<NewsEntity> selectRealTimeInfo(Map<String, Object> params);
+    Page<NewsEntity> selectRealTimeInfo(NewsParams newsParams, Page page);
+
+    String selectClassName(Integer classid);
 }
 

src/main/java/io/office/modules/manage/service/PictureService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import io.office.common.utils.PageUtils;
 import io.office.common.utils.R;
 import io.office.modules.manage.entity.PictureEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PictureParams;
 import io.office.modules.sys.entity.SysUserEntity;
 
@@ -31,5 +32,7 @@ public interface PictureService extends IService<PictureEntity> {
     R verifyPicture(PictureEntity picture, SysUserEntity user);
 
     Page<PictureEntity> selectPictureList(PictureParams params, Page page);
+
+    Page<PictureEntity> selectPictureNewList(NewsParams params, Page page);
 }
 

src/main/java/io/office/modules/manage/service/PolicyService.java

@@ -6,6 +6,7 @@ import io.office.common.utils.PageUtils;
 import io.office.common.utils.R;
 import io.office.modules.manage.entity.PictureEntity;
 import io.office.modules.manage.entity.PolicyEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PolicyParams;
 import io.office.modules.sys.entity.SysUserEntity;
 
@@ -31,5 +32,7 @@ public interface PolicyService extends IService<PolicyEntity> {
     R verifyTopic(PolicyEntity policyEntity, SysUserEntity user);
 
     Page<PictureEntity> selectPolicyList(PolicyParams params, Page page);
+
+    Page<PolicyEntity> selectPolicyNewList(NewsParams params, Page page);
 }
 

src/main/java/io/office/modules/manage/service/TopicnewsService.java

@@ -38,5 +38,6 @@ public interface TopicnewsService extends IService<TopicnewsEntity> {
 
     List<TopicNewsPartyVo>getTopicNewsByCondition(TopicNewsPartyRequestVo topicNewsPartyRequestVo);
 
+    Page<NewsEntity> getHdbdList(NewsParams newsParams, Page page);
 }
 

src/main/java/io/office/modules/manage/service/impl/NewsServiceImpl.java

@@ -114,8 +114,17 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
     }
 
     @Override
-    public List<NewsEntity> selectRealTimeInfo(Map<String, Object> params) {
-        return newsDao.selectRealTimeInfo(params);
+    public Page<NewsEntity> selectRealTimeInfo(NewsParams newsParams, Page page) {
+        List<NewsEntity> newsList = this.newsDao.selectRealTimeInfo(newsParams, page);
+        page.setRecords(newsList);
+        return page;
+    }
+
+    @Override
+    public String selectClassName(Integer classid) {
+        String name = this.newsDao.selectClassName(classid);
+        return name;
     }
 
+
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/PictureServiceImpl.java

@@ -7,6 +7,7 @@ import io.office.common.utils.R;
 import io.office.modules.manage.dao.PictureDao;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.PictureEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PictureParams;
 import io.office.modules.manage.service.PictureService;
 import io.office.modules.sys.entity.SysUserEntity;
@@ -107,4 +108,11 @@ public class PictureServiceImpl extends ServiceImpl<PictureDao, PictureEntity> i
         return page;
     }
 
+    @Override
+    public Page<PictureEntity> selectPictureNewList(NewsParams params, Page page) {
+        List<PictureEntity> newsList = this.pictureDao.selectPictureNewList(params, page);
+        page.setRecords(newsList);
+        return page;
+    }
+
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/PolicyServiceImpl.java

@@ -9,6 +9,7 @@ import io.office.modules.manage.dao.PolicyDao;
 import io.office.modules.manage.entity.NewsEntity;
 import io.office.modules.manage.entity.PictureEntity;
 import io.office.modules.manage.entity.PolicyEntity;
+import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.entity.dto.PolicyParams;
 import io.office.modules.manage.service.PolicyService;
 import io.office.modules.sys.entity.SysUserEntity;
@@ -104,4 +105,11 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyDao, PolicyEntity> impl
         return page;
     }
 
+    @Override
+    public Page<PolicyEntity> selectPolicyNewList(NewsParams params, Page page) {
+        List<PolicyEntity> newsList = this.policyDao.selectPolicyNewList(params, page);
+        page.setRecords(newsList);
+        return page;
+    }
+
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/TopicnewsServiceImpl.java

@@ -111,4 +111,11 @@ public class TopicnewsServiceImpl extends ServiceImpl<TopicnewsDao, TopicnewsEnt
         return topicnewsDao.getTopicNewsByCondition(topicNewsPartyRequestVo);
     }
 
+    @Override
+    public Page<NewsEntity> getHdbdList(NewsParams newsParams, Page page) {
+        List<NewsEntity> list = this.newsDao.getHdbdList(newsParams,page);
+        page.setRecords(list);
+        return page;
+    }
+
 }
\ No newline at end of file

src/main/resources/mapper/manage/IndexCarouselManageDao.xml

@@ -49,6 +49,9 @@
         <if test="indexCarouselManage.classnum !=null and indexCarouselManage.classnum !=''">
             and t.classnum = #{indexCarouselManage.classnum}
         </if>
+        <if test="indexCarouselManage.startTime !=null and indexCarouselManage.endTime !=null">
+            and starttime_index BETWEEN #{indexCarouselManage.startTime} AND #{indexCarouselManage.endTime}
+        </if>
         <choose>
             <when test="indexCarouselManage.levels != 0">
                 AND t.levels = #{indexCarouselManage.levels}

src/main/resources/mapper/manage/NewsDao.xml

@@ -199,11 +199,40 @@
                   t1.name
         from news t
                      LEFT JOIN newsClass t1
-                on t.classid = t1.columnid
+                on t.classid = t1.id
         where 	t1.name is not null
-        and t.classid = #{classid}
+        and t.classid = #{newsParams.classId}
         and t.levels > 0
         and  t.status = '1'
         order  by t.levels desc,t.showtime desc ,t.id desc
     </select>
+
+    <select id="getHdbdList" resultMap="newsMap">
+        SELECT t.id,
+               t.title,
+               t.author,
+               t.showtime,
+               t.startdate,
+               t.keyword,
+               t.editor,
+               t.lasteditor,
+               t.auditor,
+               t.status,
+               t1.classid,
+               t.levels,
+               t.releasedate,
+               t.updatedate
+        FROM TopIcNews t1
+                              LEFT JOIN
+                              news t
+                                      ON t1.NewsId = t.id
+                                              and t.levels > 0
+                                              and  t.status = '1'
+            and t1.classid = #{newsParams.classId}
+        order  by t.levels desc,t.showtime desc ,t.id desc
+    </select>
+
+    <select id="selectClassName" resultType="java.lang.String">
+        SELECT name FROM newsClass t where id = #{classid}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/manage/PictureDao.xml

@@ -54,6 +54,9 @@
         <if test="params.pictureType !='' and params.pictureType !=null">
             and t.Picture_type =#{params.pictureType}
         </if>
+        <if test="params.inputDateStart !=null and params.inputDateEnd !=null">
+            and inputDate BETWEEN #{params.inputDateStart} AND #{params.inputDateEnd}
+        </if>
         <choose>
             <when test="params.pictureLevel != 0">
                 AND PicLevel = #{params.pictureLevel}
@@ -65,4 +68,24 @@
         ORDER BY
                 pictureID DESC
     </select>
+    <select id="selectPictureNewList" resultMap="pictureMap" parameterType="io.office.modules.manage.entity.dto.PictureParams">
+        SELECT
+        t.pictureID,
+        t.title,
+        t.Picture_type,
+        t.showtime,
+        t.inputDate,
+        t.keyword,
+        t.Editor,
+        t.lasteditor,
+        t.auditor,
+        t.Status,
+        t.PicLevel
+        FROM
+        picture t
+        where 1=1
+          and t.PicLevel > 0
+          and  t.status = '1'
+        order  by t.PicLevel desc,t.showtime desc ,t.inputDate desc,t.pictureID desc
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/manage/PolicyDao.xml

@@ -49,5 +49,12 @@
         id DESC
     </select>
 
+    <select id="selectPolicyNewList" resultMap="policyMap" parameterType="io.office.modules.manage.entity.dto.PolicyParams">
+        select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels from Policy
+        where 1=1
+          and levels > 0
+          and  status = '1'
+        order  by levels desc,releasedate desc ,id desc
+    </select>
 
 </mapper>
\ No newline at end of file

src/main/resources/mapper/manage/TopicnewsDao.xml

@@ -29,7 +29,7 @@
         b.releasedate,
         b.updatedate
         FROM
-                TopIcNews AS a
+        (select classid,newsid FROM TopIcNews  group BY classid,newsid) AS a
         LEFT JOIN news AS b ON a.newsid = b.id
         WHERE
                 a.classid = #{newsParams.classId}
@@ -63,8 +63,7 @@
             </otherwise>
         </choose>
         ORDER BY
-        b.levels DESC,
-        b.releasedate DESC
+        a.newsid DESC
     </select>