物业管理端评论

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -177,6 +177,7 @@ public class Constants
     public static final String FOR ="4";
     public static final String FIV ="5";
     public static final String Y ="Y";
+    public static final String N ="N";
     public static final String FRONT = "front";
     public static final String BACK = "back";
     public static final String UP = "up";

ruoyi-system/src/main/java/com/ruoyi/system/domain/complaintSuggestion/ComplaintSuggestion.java

@@ -57,6 +57,11 @@ public class ComplaintSuggestion extends BaseEntity
     /** 投诉建议是否公开：Y（公开）、N（不公开） */
     @Excel(name = "投诉建议是否公开", readConverterExp = "Y=公开,N=不公开")
     private String isPublic;
+    /**
+     * 投诉建议是否已读：Y（已读）、N（未读）
+     */
+    private String isRead;
+
 
     /** 是否删除：Y（删除）、N（不删除） */
     private String isDel;
@@ -65,6 +70,14 @@ public class ComplaintSuggestion extends BaseEntity
      */
     private List<SuggestionFj> suggestionFjList;
 
+    public String getIsRead() {
+        return isRead;
+    }
+
+    public void setIsRead(String isRead) {
+        this.isRead = isRead;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -173,7 +186,8 @@ public class ComplaintSuggestion extends BaseEntity
     }
 
     @Override
-    public String toString() {
+    public String
+    toString() {
         return "ComplaintSuggestion{" +
                 "suggestionId=" + suggestionId +
                 ", userId=" + userId +
@@ -185,6 +199,7 @@ public class ComplaintSuggestion extends BaseEntity
                 ", replyContent='" + replyContent + '\'' +
                 ", type='" + type + '\'' +
                 ", isPublic='" + isPublic + '\'' +
+                ", isRead='" + isRead + '\'' +
                 ", isDel='" + isDel + '\'' +
                 ", suggestionFjList=" + suggestionFjList +
                 '}';

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ComplaintSuggestionServiceImpl.java

@@ -42,6 +42,7 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
      * @return 投诉建议
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ComplaintSuggestion selectComplaintSuggestionBySuggestionId(Long suggestionId)
     {
         ComplaintSuggestion complaintSuggestion = complaintSuggestionMapper.selectComplaintSuggestionBySuggestionId(suggestionId);
@@ -51,6 +52,22 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
         if (suggestionFjs != null && suggestionFjs.size() > 0){
             complaintSuggestion.setSuggestionFjList(suggestionFjs);
         }
+        //判断是否已读如果是未读设置成已读
+        String isRead = complaintSuggestion.getIsRead();
+        Long userId = complaintSuggestion.getUserId();
+        if (N.equals(isRead) && userId.equals(SecurityUtils.getUserId())){
+            complaintSuggestion.setIsRead(Y);
+            complaintSuggestionMapper.updateComplaintSuggestion(complaintSuggestion);
+            //app首页统计减少一个数
+            String userSuggestionKey = COMPLAINT_SUGGESTION_NO + userId;
+            //往redis中新增 个人 投诉建议未回复的数量 app统计使用 回复了这个用户的投诉，这个用户能看到
+            Object userNum = redisCache.getCacheObject(userSuggestionKey);
+            if (ObjectUtils.isNotEmpty(userNum)) {
+                redisCache.setCacheObject(userSuggestionKey, Math.max((int) userNum - 1, 0));
+            }else {
+                redisCache.setCacheObject(userSuggestionKey,0);
+            }
+        }
         return complaintSuggestion;
     }
 
@@ -80,14 +97,6 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
         complaintSuggestion.setUserId(userId);
         int result = complaintSuggestionMapper.insertComplaintSuggestion(complaintSuggestion);
         if (result > 0){
-            String userSuggestionKey = COMPLAINT_SUGGESTION_NO + userId;
-            //往redis中新增 个人 投诉建议未回复的数量 app统计使用
-            Object userNum = redisCache.getCacheObject(userSuggestionKey);
-            if (ObjectUtils.isNotEmpty(userNum)) {
-                redisCache.setCacheObject(userSuggestionKey, Math.max((int) userNum + 1, 0));
-            }else {
-                redisCache.setCacheObject(userSuggestionKey,1);
-            }
             //往redis中新增 总数 投诉建议未回复的数量 app统计使用
             Object allNum = redisCache.getCacheObject(COMPLAINT_SUGGESTION_NO_ALL);
             if (ObjectUtils.isNotEmpty(allNum)) {
@@ -118,12 +127,12 @@ public class ComplaintSuggestionServiceImpl implements IComplaintSuggestionServi
                 suggestionFjMapper.batchSuggestionFj(suggestionFjList);
             }
             String userSuggestionKey = COMPLAINT_SUGGESTION_NO + userId;
-            //往redis中新增 个人 投诉建议未回复的数量 app统计使用
+            //往redis中新增 个人 投诉建议未回复的数量 app统计使用 回复了这个用户的投诉，这个用户能看到
             Object userNum = redisCache.getCacheObject(userSuggestionKey);
             if (ObjectUtils.isNotEmpty(userNum)) {
-                redisCache.setCacheObject(userSuggestionKey, Math.max((int) userNum - 1, 0));
+                redisCache.setCacheObject(userSuggestionKey, Math.max((int) userNum + 1, 0));
             }else {
-                redisCache.setCacheObject(userSuggestionKey,0);
+                redisCache.setCacheObject(userSuggestionKey,1);
             }
             //往redis中新增 总数 投诉建议未回复的数量 app统计使用
             Object allNum = redisCache.getCacheObject(COMPLAINT_SUGGESTION_NO_ALL);

ruoyi-system/src/main/resources/mapper/system/ComplaintSuggestionMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="replyContent"    column="reply_content"    />
         <result property="type"    column="type"    />
         <result property="isPublic"    column="is_public"    />
+        <result property="isRead"    column="is_read"    />
         <result property="userId"    column="user_id"    />
         <result property="isDel"    column="is_del"    />
         <result property="createBy"    column="create_by"    />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectComplaintSuggestionVo">
-        select suggestion_id, title, content, images, created_time, status, reply_content, type, is_public, user_id, is_del, create_by, create_time, update_by, update_time, remark from complaint_suggestion
+        select suggestion_id, title, content, images, created_time,is_read, status, reply_content, type, is_public, user_id, is_del, create_by, create_time, update_by, update_time, remark from complaint_suggestion
     </sql>
 
     <select id="selectComplaintSuggestionList" parameterType="ComplaintSuggestion" resultMap="ComplaintSuggestionResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null  and replyContent != ''"> and reply_content = #{replyContent}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="isPublic != null  and isPublic != ''"> and is_public = #{isPublic}</if>
+            <if test="isRead != null  and isRead != ''"> and is_read = #{isRead}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
@@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null">reply_content,</if>
             <if test="type != null">type,</if>
             <if test="isPublic != null">is_public,</if>
+            <if test="isRead != null">is_read,</if>
             <if test="userId != null">user_id,</if>
             <if test="isDel != null">is_del,</if>
             <if test="createBy != null">create_by,</if>
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null">#{replyContent},</if>
             <if test="type != null">#{type},</if>
             <if test="isPublic != null">#{isPublic},</if>
+            <if test="isRead != null">#{isRead},</if>
             <if test="userId != null">#{userId},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="replyContent != null">reply_content = #{replyContent},</if>
             <if test="type != null">type = #{type},</if>
             <if test="isPublic != null">is_public = #{isPublic},</if>
+            <if test="isRead != null">is_read = #{isRead},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="createBy != null">create_by = #{createBy},</if>