新闻点赞，浏览

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -120,5 +120,4 @@ public class RegionController {
     public RestResponse users(@RequestBody Region region) {
         return regionService.selectRegionUser(region);
     }
-
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -34,5 +34,4 @@ public interface RegionMapper extends BaseMapper<Region> {
 
     @Select("select user_id userId,name from user_info where user_id in (${clerks})")
     List<Map<String, Object>> selectRegionMember(@Param("clerks") String clerk);
-
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -123,13 +123,17 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         }
         HashMap<String, Object> data = new HashMap<>();
         List<Map<String, Object>> regionUser = this.baseMapper.selectRegionMember(region.getUserId().toString());
-        List<Map<String, Object>> regionClerk = this.baseMapper.selectRegionMember(region.getClerk());
-        if (regionUser.get(1) == null) {
+        if (region.getClerk() != null && !region.getClerk().equals("-1")) {
+            List<Map<String, Object>> regionClerk = this.baseMapper.selectRegionMember(region.getClerk());
+            data.put("regionClerk", regionClerk);
+        } else {
+            data.put("regionClerk", null);
+        }
+        if (regionUser.get(0) == null) {
             data.put("regionUser", regionUser);
         } else {
-            data.put("regionUser", regionUser.get(1).get("name"));
+            data.put("regionUser", regionUser.get(0).get("name"));
         }
-        data.put("regionClerk", regionClerk);
         return RestResponse.ok(data, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 }

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

@@ -1,13 +1,19 @@
 package cn.com.ty.lift.quan.news.controller;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
 import cn.com.ty.lift.quan.news.service.impl.QuanNewsServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 /**
  * <p>
  * 电梯圈新闻公告 前端控制器
@@ -21,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping("/quan-news")
 public class QuanNewsController {
     private final QuanNewsServiceImpl quanNewsService;
+    private final StringRedisTemplate redisTemplate;
 
     @PostMapping("/list")
     /**
@@ -103,4 +110,15 @@ public class QuanNewsController {
     public RestResponse delete(@RequestBody QuanNews quanNews) {
         return quanNewsService.delete(quanNews.getId());
     }
+
+    @PostMapping("/like")
+    public RestResponse like(@RequestBody QuanNewsReq req) {
+        String users = redisTemplate.opsForValue().get("quan-users");
+        if (users == null) {
+            redisTemplate.opsForValue().append("quan-users", req.getUserId().toString());
+        } else {
+            redisTemplate.opsForValue().append("quan-users", users + "," + req.getUserId());
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "成功");
+    }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/QuanNews.java

@@ -74,5 +74,9 @@ public class QuanNews implements Serializable {
     @TableField("release_id")
     private Long releaseId;
 
-
+    /**
+     *  此新闻的点赞及浏览的用户列表
+     * */
+    @TableField("quan_news_record_id")
+    private Long quanNewsRecordId;
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/model/QuanNewsReq.java

@@ -88,4 +88,8 @@ public class QuanNewsReq extends BaseRequestModel implements Serializable {
     @TableField(exist = false)
     private Integer type;
 
+    /***
+     * 点赞的用户id
+     */
+    private Long userId;
 }

lift-quan-service/src/main/resources/application.yml

@@ -16,6 +16,17 @@ spring:
       file-size-threshold: 0
       max-file-size: 500MB
       max-request-size: 500MB
+  #redis缓存配置
+  redis:
+    database: 0 #数据库索引，默认为0
+    host: 47.102.213.169 #服务器地址
+    port: 6379 #端口
+    jedis:
+      pool:
+        max-active: 8 #最大连接数
+        max-idle: 8 #最大空闲链接
+        max-wait: 20000ms
+        min-idle: 0
 
 #自动添加createTime、isDelete 等字段
 xwy: