资讯模块数据——数据展示功能修复

wisenergy-common/src/main/java/cn/wisenergy/common/enums/LikedStatusEnum.java

+package cn.wisenergy.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 用户点赞的状态
+ * Created by m1991 on 2021/3/12 17:02
+ */
+@Getter
+public enum LikedStatusEnum {
+
+    LIKE(1, "点赞"),
+    UNLIKE(0, "取消点赞/未点赞"),
+            ;
+
+    private Integer code;
+
+    private String msg;
+
+    LikedStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+}

wisenergy-common/src/main/java/cn/wisenergy/common/utils/Constants.java

@@ -44,6 +44,8 @@ public class Constants {
         public final static Integer MINUTE_INT = SECOND_INT * 180;
         //半小时
         public final static Integer HALF_HOUR_INT = MINUTE_INT * 30;
+        //十小时
+        public final static Integer TEN_HOURS_HOUR_INT = HALF_HOUR_INT * 20;
     }
     //正则的一些常量
     public static class RegConstant{

wisenergy-common/src/main/java/cn/wisenergy/common/utils/RedisKeyUtils.java

@@ -36,4 +36,24 @@ public class RedisKeyUtils {
         return null;
     }
 
+    //保存用户点赞数据的key
+    public static final String MAP_KEY_USER_LIKED = "MAP_USER_LIKED";
+    //保存用户被点赞数量的key
+    public static final String MAP_KEY_USER_LIKED_COUNT = "MAP_USER_LIKED_COUNT";
+
+    /**
+     * 拼接被点赞的用户id和点赞的人的id作为key。格式 222222::333333
+     * @param likedUserId 被点赞的人id
+     * @param likedPostId 点赞的人的id
+     * @return
+     */
+    public static String getLikedKey(String likedUserId, String likedPostId){
+        StringBuilder builder = new StringBuilder();
+        builder.append(likedUserId);
+        builder.append("::");
+        builder.append(likedPostId);
+        return builder.toString();
+    }
+
+
 }
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/app/userLikes.java

+package cn.wisenergy.model.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 用户点赞资讯记录表
+ * Created by m1991 on 2021/3/12 15:57
+ */
+@Data
+@ApiModel(value = "userLikes")
+public class userLikes implements Serializable {
+
+    private static final long serialVersionUID = 3050641578536493424L;
+    /**
+     * 账户主键id
+     */
+    @ApiModelProperty(name = "like_id", value = "用户点赞资讯记录表id")
+    private Integer likeId;
+
+    @ApiModelProperty(name = "userLikeId", value = "点赞用户的ID")
+    private String userLikeId;
+
+    @ApiModelProperty(name = "liked_id", value = "被用户点赞的资讯ID")
+    private Integer likedId;
+
+    @ApiModelProperty(name = "liked_status", value = "点赞状态")
+    private Integer likedStatus;
+
+    @ApiModelProperty(name = "liked_type", value = "点赞类型")
+    private Integer likedType;
+
+    @ApiModelProperty(name = "liked_time", value = "点赞时间")
+    private Timestamp likedTime;
+
+
+
+
+
+
+
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/RedisService.java

+//package cn.wisenergy.service.app;
+//
+///**
+// * Created by m1991 on 2021/3/12 16:57
+// */
+//public interface  RedisService {
+//    /**
+//     * 点赞。状态为1
+//     * @param likedUserId
+//     * @param likedPostId
+//     */
+//    void saveLiked2Redis(String likedUserId, String likedPostId);
+//
+//    /**
+//     * 取消点赞。将状态改变为0
+//     * @param likedUserId
+//     * @param likedPostId
+//     */
+//    void unlikeFromRedis(String likedUserId, String likedPostId);
+//
+//    /**
+//     * 从Redis中删除一条点赞数据
+//     * @param likedUserId
+//     * @param likedPostId
+//     */
+//    void deleteLikedFromRedis(String likedUserId, String likedPostId);
+//
+//    /**
+//     * 该用户的点赞数加1
+//     * @param likedUserId
+//     */
+//    void incrementLikedCount(String likedUserId);
+//
+//    /**
+//     * 该用户的点赞数减1
+//     * @param likedUserId
+//     */
+//    void decrementLikedCount(String likedUserId);
+//
+//    /**
+//     * 获取Redis中存储的所有点赞数据
+//     * @return
+//     */
+//    List<UserLike> getLikedDataFromRedis();
+//
+//    /**
+//     * 获取Redis中存储的所有点赞数量
+//     * @return
+//     */
+//    List<LikedCountDTO> getLikedCountFromRedis();
+//
+//}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RedisServiceImpl.java

+//package cn.wisenergy.service.app.impl;
+//
+//import cn.wisenergy.common.enums.LikedStatusEnum;
+//import cn.wisenergy.common.utils.RedisKeyUtils;
+//import com.solo.coderiver.user.dataobject.UserLike;
+//import com.solo.coderiver.user.dto.LikedCountDTO;
+//import com.solo.coderiver.user.enums.LikedStatusEnum;
+//import com.solo.coderiver.user.service.LikedService;
+//import com.solo.coderiver.user.service.RedisService;
+//import com.solo.coderiver.user.utils.RedisKeyUtils;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.data.redis.core.Cursor;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.core.ScanOptions;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * Created by m1991 on 2021/3/12 16:58
+// */
+//@Service
+//@Slf4j
+//public class RedisServiceImpl {
+//    @Autowired
+//    RedisTemplate redisTemplate;
+//
+//    @Autowired
+//    LikedService likedService;
+//
+//    @Override
+//    public void saveLiked2Redis(String likedUserId, String likedPostId) {
+//        String key = RedisKeyUtils.getLikedKey(likedUserId, likedPostId);
+//        redisTemplate.opsForHash().put(RedisKeyUtils.MAP_KEY_USER_LIKED, key, LikedStatusEnum.LIKE.getCode());
+//    }
+//
+//    @Override
+//    public void unlikeFromRedis(String likedUserId, String likedPostId) {
+//        String key = RedisKeyUtils.getLikedKey(likedUserId, likedPostId);
+//        redisTemplate.opsForHash().put(RedisKeyUtils.MAP_KEY_USER_LIKED, key, LikedStatusEnum.UNLIKE.getCode());
+//    }
+//
+//    @Override
+//    public void deleteLikedFromRedis(String likedUserId, String likedPostId) {
+//        String key = RedisKeyUtils.getLikedKey(likedUserId, likedPostId);
+//        redisTemplate.opsForHash().delete(RedisKeyUtils.MAP_KEY_USER_LIKED, key);
+//    }
+//
+//    @Override
+//    public void incrementLikedCount(String likedUserId) {
+//        redisTemplate.opsForHash().increment(RedisKeyUtils.MAP_KEY_USER_LIKED_COUNT, likedUserId, 1);
+//    }
+//
+//    @Override
+//    public void decrementLikedCount(String likedUserId) {
+//        redisTemplate.opsForHash().increment(RedisKeyUtils.MAP_KEY_USER_LIKED_COUNT, likedUserId, -1);
+//    }
+//
+//    @Override
+//    public List<UserLike> getLikedDataFromRedis() {
+//        Cursor<Map.Entry<Object, Object>> cursor = redisTemplate.opsForHash().scan(RedisKeyUtils.MAP_KEY_USER_LIKED, ScanOptions.NONE);
+//        List<UserLike> list = new ArrayList<>();
+//        while (cursor.hasNext()){
+//            Map.Entry<Object, Object> entry = cursor.next();
+//            String key = (String) entry.getKey();
+//            //分离出 likedUserId，likedPostId
+//            String[] split = key.split("::");
+//            String likedUserId = split[0];
+//            String likedPostId = split[1];
+//            Integer value = (Integer) entry.getValue();
+//
+//            //组装成 UserLike 对象
+//            UserLike userLike = new UserLike(likedUserId, likedPostId, value);
+//            list.add(userLike);
+//
+//            //存到 list 后从 Redis 中删除
+//            redisTemplate.opsForHash().delete(RedisKeyUtils.MAP_KEY_USER_LIKED, key);
+//        }
+//
+//        return list;
+//    }
+//
+//    @Override
+//    public List<LikedCountDTO> getLikedCountFromRedis() {
+//        Cursor<Map.Entry<Object, Object>> cursor = redisTemplate.opsForHash().scan(RedisKeyUtils.MAP_KEY_USER_LIKED_COUNT, ScanOptions.NONE);
+//        List<LikedCountDTO> list = new ArrayList<>();
+//        while (cursor.hasNext()){
+//            Map.Entry<Object, Object> map = cursor.next();
+//            //将点赞数量存储在 LikedCountDT
+//            String key = (String)map.getKey();
+//            LikedCountDTO dto = new LikedCountDTO(key, (Integer) map.getValue());
+//            list.add(dto);
+//            //从Redis中删除这条记录
+//            redisTemplate.opsForHash().delete(RedisKeyUtils.MAP_KEY_USER_LIKED_COUNT, key);
+//        }
+//        return list;
+//    }
+//
+//}

wisenergy-service/wisenergy-service.iml

@@ -30,6 +30,8 @@
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
@@ -39,7 +41,10 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3" level="project" />
     <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.4.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
@@ -55,6 +60,7 @@
     <orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3" level="project" />
@@ -158,11 +164,11 @@
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-api:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
     <orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.33.ALL" level="project" />
+    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.66.ALL" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.11.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.wechatpay-apiv3:wechatpay-apache-httpclient:0.2.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
@@ -175,21 +181,9 @@
     <orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-gen:1.0.7.78771202102051104-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-api:1.0.7-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.youzan.cloud:open-sdk-common:1.0.7-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.36.v20210114" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.36.v20210114" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.36.v20210114" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.36.v20210114" level="project" />
-    <orderEntry type="library" name="Maven: com.caucho:hessian:4.0.51" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.4.15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.xuxueli:xxl-job-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.59.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy:2.5.14" level="project" />
     <orderEntry type="library" name="Maven: org.bytedeco:javacv:1.4.3" level="project" />
     <orderEntry type="library" name="Maven: org.bytedeco:javacpp:1.4.3" level="project" />
     <orderEntry type="library" name="Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3" level="project" />

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java

@@ -49,7 +49,7 @@ public class SmsController {
             return ResultUtils.returnFail ("手机号码格式不正确","1009") ;
 
         }
-        if(codeType!=Constants.Sms.CodeType.LOGIN_OR_REGISTER && codeType!=Constants.Sms.CodeType.PASS_UPDATE && codeType!=Constants.Sms.CodeType.ORDER_NOTICE){
+        if(!codeType.equals(Constants.Sms.CodeType.LOGIN_OR_REGISTER) && !codeType.equals(Constants.Sms.CodeType.PASS_UPDATE) && !codeType.equals(Constants.Sms.CodeType.ORDER_NOTICE)){
 
             return ResultUtils.returnFail ("输入codeType不正确！","1008") ;