组织管理优化，新闻公告更新

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -72,7 +72,11 @@ public class OrganizationService {
         //项目列表
         List<Project> projects = projectService.list(new QueryWrapper<Project>()
                 .select("id", "project_name", "province", "city", "district", "num")
-                .ne("region_id", null)
+                .isNotNull("province")
+                .isNotNull("city")
+                .isNotNull("district")
+                .isNotNull("unm")
+                .isNotNull("region_id")
                 .eq("mt_company_id", mtCompanyId)
         );
 

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -32,33 +32,18 @@ public class QuanNewsController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      * @since 2019/12/2 15:39
      */
-    @PostMapping("/list")
+    @PostMapping("app/list")
     public RestResponse list(@RequestBody QuanNewsReq quanNews) {
-        return quanNewsService.news(quanNews);
+        return quanNewsService.appNews(quanNews);
     }
 
     /**
      * @param quanNews pageNum,pageSize
      * @return 新闻列表
      */
-    @PostMapping("/newsList")
+    @PostMapping("/list")
     public RestResponse newsList(@RequestBody QuanNewsReq quanNews) {
-        return RestResponse.success(quanNewsService.page(
-                        new Page<>(quanNews.getPageNum(),
-                                quanNews.getPageSize()),
-                Wrappers.<QuanNews>query().orderByDesc("release_date")));
-    }
-
-    /**
-     * 置顶/取消置顶
-     *
-     * @param request [新闻id]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
-     * @since 2019/12/2 15:40
-     */
-    @PostMapping("/top")
-    public RestResponse top(@RequestBody QuanNewsReq request) {
-        return quanNewsService.top(request.getId(), request.getType());
+        return quanNewsService.news(quanNews);
     }
 
     /**
@@ -76,13 +61,13 @@ public class QuanNewsController {
     /**
      * 新增新闻
      *
-     * @param request [新闻标题, 新闻内容, 视频文件, 发布人id]
+     * @param quanNews [新闻标题, 新闻内容, 视频文件, 发布人id]
      * @return org.springframework.http.ResponseEntity
      * @since 2019/12/2 15:48
      */
     @PostMapping("/add")
-    public RestResponse add(@RequestBody QuanNewsReq request) {
-        return quanNewsService.addNew(request);
+    public RestResponse add(@RequestBody QuanNews quanNews) {
+        return RestResponse.success(quanNewsService.save(quanNews));
     }
 
     /**
@@ -94,7 +79,7 @@ public class QuanNewsController {
      */
     @PostMapping("/update")
     public RestResponse updateNews(@RequestBody QuanNews quanNews) {
-        return quanNewsService.updateNews(quanNews);
+        return RestResponse.success(quanNewsService.updateById(quanNews));
     }
 
     /**
@@ -106,7 +91,7 @@ public class QuanNewsController {
      */
     @PostMapping("/delete")
     public RestResponse delete(@RequestBody QuanNews quanNews) {
-        return quanNewsService.delete(quanNews.getId());
+        return RestResponse.success(quanNewsService.removeById(quanNews));
     }
 
     /**

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/service/impl/QuanNewsServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.com.ty.lift.quan.news.service.impl;
 
-import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.quan.news.dao.entity.MapInfo;
 import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
@@ -43,7 +42,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
      *
      * @since 2019/12/3 10:30
      */
-    public RestResponse news(QuanNewsReq request) {
+    public RestResponse appNews(QuanNewsReq request) {
         Page<QuanNews> page = new Page<>(request.getPageNum(), request.getPageSize());
         IPage<Map<String, Object>> news = this.pageMaps(page, new QueryWrapper<QuanNews>()
                 .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
@@ -69,6 +68,19 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         return RestResponse.success(result);
     }
 
+    public RestResponse news(QuanNewsReq request) {
+        Page<QuanNews> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<Map<String, Object>> news = this.pageMaps(page, new QueryWrapper<QuanNews>()
+                .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
+                .orderByDesc("release_date"));
+        //全部新闻的浏览量列表
+        Map<Object, Object> lookTimes = redisTemplate.boundHashOps("system-quanNews-look-time").entries();
+        //全部新闻的点赞用户列表
+        Map<Object, Object> likeUsers = redisTemplate.opsForHash().entries("system-quanNews-like-users");
+        newsAddLookAndLike(news.getRecords(), lookTimes, likeUsers);
+        return RestResponse.success(news);
+    }
+
     /**
      * 将新闻置顶
      *
@@ -185,71 +197,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         }
     }
 
-    public RestResponse addNew(QuanNewsReq request) {
-        QuanNews quanNews = new QuanNews();
-        quanNews.setTitle(request.getTitle())
-                .setContent(request.getContent())
-                .setReleaseId(request.getReleaseId())
-                .setReleaseUser(request.getReleaseUser())
-                .setTopSerial(0);
-        if (request.getIsTop() != 0) {
-            List<QuanNews> tops;
-            //获取置顶新闻列表
-            tops = this.list(new QueryWrapper<QuanNews>().ne("top_serial", 0));
-            //设置添加的新闻置顶排序为第1个
-            quanNews.setTopSerial(1);
-            //遍历其它新闻，序号+1
-            if (!tops.isEmpty()) {
-                tops.forEach(top -> top.setTopSerial(top.getTopSerial() + 1));
-                if (this.updateBatchById(tops) && this.save(quanNews)) {
-                    return RestResponse.success(quanNews.getId(), "成功");
-                } else {
-                    return RestResponse.fail();
-                }
-            }
-        }
-        //添加新闻
-        if (this.save(quanNews)) {
-            return RestResponse.success(quanNews.getId(), "成功");
-        } else {
-            return RestResponse.fail();
-        }
-    }
-
-    /**
-     * 更新新闻
-     *
-     * @since 2019/12/4 13:34
-     */
-    public RestResponse updateNews(QuanNews quanNews) {
-        if (this.updateById(quanNews)) {
-            return RestResponse.success(null, "成功");
-        } else {
-            return RestResponse.fail();
-        }
-    }
-
-    /**
-     * 删除新闻
-     *
-     * @since 2019/12/4 13:55
-     */
-    public RestResponse delete(Long id) {
-        QuanNews byId = this.getById(id);
-        if (null == byId) {
-            return RestResponse.success();
-
-        }
-        if (byId.getTopSerial() != 0) {
-            //取消新闻置顶
-            this.top(id, 0);
-        }
-        if (this.removeById(id)) {
-            return RestResponse.success(null, "成功");
-        } else {
-            return RestResponse.fail();
-        }
-    }
 
     public RestResponse like(QuanNewsReq request) {
         String userId = request.getUserId().toString();