回收站字段和该字段的逻辑

WxrLZQ · WxrLZQ · commit 50d80a75d119 · 2021-09-03T10:16:23.000+08:00
作品被删除时用户的喜爱数的校正
用户个人作品数的校正
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java b/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java
@@ -82,6 +82,12 @@ public class AccountResult implements Serializable{
     @TableField("description")
     @JsonProperty("description")
     private String description;
+    /**
+     * 作品数
+     */
+    @TableField("works")
+    @JsonProperty("works")
+    private Integer works;
     /**
      * 喜爱人数
      */
@@ -100,12 +106,19 @@ public class AccountResult implements Serializable{
     @TableField("following")
     @JsonProperty("following")
     private Integer following;
-    @TableField(exist = false)
+    /**
+     * 回收站
+     */
+    @TableField("recycle")
+    @JsonProperty("recycle")
+    private Integer recycle;
     /**
      * 我的关注
      */
+    @TableField(exist = false)
     @JsonProperty("myFollow")
     private Boolean myFollow=false;
+
     /**
      * 创建时间
      */
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java
@@ -103,6 +103,12 @@ public class Account implements Serializable, UserDetails {
     @TableField("description")
     @JsonProperty("description")
     private String description;
+    /**
+     * 作品数
+     */
+    @TableField("works")
+    @JsonProperty("works")
+    private Integer works;
     /**
      * 喜爱人数
      */
@@ -121,6 +127,12 @@ public class Account implements Serializable, UserDetails {
     @TableField("following")
     @JsonProperty("following")
     private Integer following;
+    /**
+     * 回收站
+     */
+    @TableField("recycle")
+    @JsonProperty("recycle")
+    private Integer recycle;
     /**
      * 创建时间
      */
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountService.java
@@ -33,7 +33,33 @@ public interface AccountService {
      */
     Boolean update(Account account) throws Exception;
 
-    Boolean updateFavorites(String username);
+    /**
+     * 增加作品数
+     * @param username
+     * @return
+     */
+    Boolean addWorks(String username);
+
+    /**
+     * 减少作品数
+     * @param username
+     * @return
+     */
+    Boolean reduceWorks(String username);
+
+    /**
+     * 添加喜爱数
+     * @param username
+     * @return
+     */
+    Boolean addFavorites(String username);
+
+    /**
+     * 更新喜爱数（校正喜爱数）
+     * @param account
+     * @return
+     */
+    Boolean updateFavorites(Account account);
 
     /**
      * 根据第三方id查询用户
@@ -56,8 +82,19 @@ public interface AccountService {
      */
     void deleteAccount(Account account);
 
+    /**
+     * 增加回收站作品数
+     * @param username
+     * @return
+     */
+    Boolean increaseRecycle(String username);
 
-
+    /**
+     * 删除回收站作品
+     * @param username
+     * @return
+     */
+    Boolean reduceRecycle(String username);
 
 
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountMapper.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountMapper.java
@@ -12,5 +12,16 @@
  */
 @Repository
 public interface AccountMapper extends BaseMapper<Account> {
-    Integer updateFavorites(@Param("username") String username);
+
+    Integer addFavorites(@Param("username") String username);
+
+    Integer updateFavorites(Account account);
+
+    Integer addWorks(@Param("username") String username);
+
+    Integer reduceWorks(@Param("username") String username);
+
+    Integer increaseRecycle(@Param("username") String username);
+
+    Integer reduceRecycle(@Param("username") String username);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/rabbitmq/QueueReceiver.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/rabbitmq/QueueReceiver.java
@@ -1,6 +1,7 @@
 package com.lzq.dubboservice.rabbitmq;
 
 import com.lzq.api.pojo.Example;
+import com.lzq.api.service.AccountService;
 import com.lzq.api.service.ContentService;
 import com.lzq.api.service.ExampleService;
 import com.lzq.api.service.FavoritesService;
@@ -34,6 +35,9 @@ public class QueueReceiver {
     @Autowired
     FavoritesService favoritesService;
 
+    @Autowired
+    AccountService accountService;
+
     @RabbitHandler
     public void process(Example example){
         log.info(example.toString());
@@ -50,6 +54,9 @@ public void process(Example example){
         QiniuyunUtils.deleteFiles(example.getImg());
         //删除用户的喜爱
         favoritesService.deleteFavorites(example.getExampleId());
+        //减少回收站数量（删除实例）
+        accountService.reduceRecycle(example.getUsername());
+
     }
 
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountServiceImpl.java
@@ -49,8 +49,23 @@ public Boolean update(Account account) throws NullPointerException {
     }
 
     @Override
-    public Boolean updateFavorites(String username) {
-        return baseMapper.updateFavorites(username)>0?true:false;
+    public Boolean addWorks(String username) {
+        return baseMapper.addWorks(username)>0?true:false;
+    }
+
+    @Override
+    public Boolean reduceWorks(String username) {
+        return baseMapper.reduceWorks(username)>0?true:false;
+    }
+
+    @Override
+    public Boolean addFavorites(String username) {
+        return baseMapper.addFavorites(username)>0?true:false;
+    }
+
+    @Override
+    public Boolean updateFavorites(Account account) {
+        return baseMapper.updateFavorites(account)>0?true:false;
     }
 
     @Override
@@ -79,5 +94,15 @@ public void deleteAccount(Account account) {
         baseMapper.delete(wrapper);
     }
 
+    @Override
+    public Boolean increaseRecycle(String username) {
+        return baseMapper.increaseRecycle(username)>0?true:false;
+    }
+
+    @Override
+    public Boolean reduceRecycle(String username) {
+        return baseMapper.reduceRecycle(username)>0?true:false;
+    }
+
 
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java
@@ -60,6 +60,7 @@ public PageInfo<Example> queryByPublic(String username, Integer currentPage) {
     @Override
     public void deleteExample(Integer exampleId) {
          baseMapper.deleteExample(exampleId);
+
     }
 
 
diff --git a/springboot-dubbo-service/src/main/resources/mapper/AccoutMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/AccoutMapper.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lzq.dubboservice.mapper.AccountMapper">
-    <update id="updateFavorites">
+
+
+    <update id="addFavorites">
         update account set favorites=favorites+1 where username=#{username}
     </update>
+    <update id="updateFavorites">
+        update account set favorites=#{favorites} where username=#{username}
+    </update>
+    <update id="addWorks">
+        update account set works=works+1 where username=#{username}
+    </update>
+    <update id="reduceWorks">
+        update account set works=works-1 where username=#{username}
+    </update>
+    <update id="increaseRecycle">
+        update account set recycle=recycle+1 where username=#{username}
+    </update>
+    <update id="reduceRecycle">
+        update account set recycle=recycle-1 where username=#{username}
+    </update>
 </mapper>
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java b/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java
@@ -7,6 +7,7 @@
 import com.lzq.web.utils.JWTUtils;
 import com.lzq.web.utils.ResultMapUtils;
 import com.lzq.web.utils.UserUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +22,7 @@
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;
-
+@Slf4j
 @Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
@@ -50,7 +51,10 @@ protected void configure(HttpSecurity http) throws Exception {
                     Account account = (Account) authentication.getPrincipal();
                     Integer count = favoritesService.getCount(account.getUsername());
                     if (!count.equals(account.getFavorites())){
-
+                        account.setFavorites(count);
+                        //更新（校正）我的喜爱数
+                        Boolean aBoolean = accountService.updateFavorites(account);
+                        log.info(aBoolean.toString());
                     }
                     //是否需要进行第三方绑定
                     String token = httpServletRequest.getHeader("token");
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java
@@ -9,7 +9,6 @@
 import com.lzq.api.service.ExampleService;
 import com.lzq.api.service.FavoritesService;
 import com.lzq.web.utils.ExampleUtils;
-import com.lzq.web.utils.JWTUtils;
 import com.lzq.web.utils.QiniuyunUtils;
 import com.lzq.web.utils.ResultMapUtils;
 import com.qiniu.util.StringUtils;
@@ -26,15 +25,13 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -90,6 +87,8 @@ public Map<String, Object> CreateFile(Example example) {
             example.setFileName(Long.toString(time));
             //把文件信息插入到数据库中
             Boolean bol = exampleService.insert(example);
+            Boolean aBoolean = accountService.addWorks(example.getUsername());
+            log.info(aBoolean.toString());
             return ResultMapUtils.ResultMap(bol, 0, example);
         } catch (Exception e) {
             e.printStackTrace();
@@ -168,13 +167,15 @@ public Map<String,Object> addFavorites(Favorites favorites){
                 redisTemplate.opsForList().leftPush(favorites.getUsername()+"fav",favorites.getExampleId());
             }
             //更新用户喜爱数量
-            Boolean aBoolean = accountService.updateFavorites(favorites.getUsername());
+            Boolean aBoolean = accountService.addFavorites(favorites.getUsername());
             log.info(aBoolean.toString());
             return ResultMapUtils.ResultMap(bol,0,null);
         }else {
             return ResultMapUtils.ResultMap(false,1,null);
         }
     }
+
+
     /**
      * 放入回收站
      * @param example
@@ -192,11 +193,15 @@ public Map<String,Object> deleteExample(Example example){
             rabbitTemplate.convertAndSend("delete_exchange", "delete", example, new MessagePostProcessor() {
                 @Override
                 public Message postProcessMessage(Message message) throws AmqpException {
-                    //设置延迟时间
-                    message.getMessageProperties().setHeader("x-delay",1000*15);
+                    //设置延迟时间 1天
+                    message.getMessageProperties().setHeader("x-delay",1000*60*60*24*1);
                     return message;
                 }
             });
+            //减少用户作品数
+            accountService.reduceWorks(example.getUsername());
+            //回收站数量增加
+            accountService.increaseRecycle(example.getUsername());
             return ResultMapUtils.ResultMap(b,0,null);
         }else {
             return ResultMapUtils.ResultMap(b,0,null);
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java
@@ -5,9 +5,7 @@
 import com.lzq.api.dto.ExampleAccount;
 import com.lzq.api.pojo.Account;
 import com.lzq.api.pojo.Example;
-import com.lzq.api.service.AccountResultService;
-import com.lzq.api.service.ExampleAccountService;
-import com.lzq.api.service.ExampleService;
+import com.lzq.api.service.*;
 import com.lzq.web.utils.JWTUtils;
 import com.lzq.web.utils.ResultMapUtils;
 import io.swagger.annotations.Api;
@@ -45,6 +43,12 @@ public class QueryController {
     @Reference
     private ExampleService exampleService;
 
+    @Reference
+    private FavoritesService favoritesService;
+
+    @Reference
+    private AccountService accountService;
+
     @Autowired
     private RedisTemplate redisTemplate;
 
@@ -57,7 +61,20 @@ public class QueryController {
     @GetMapping("/queryByUsername")
     @ApiOperation("根据用户名查询用户信息")
     public Map<String, Object> queryByUsername(String username) {
+        //获取用户信息
         AccountResult result = accountResultService.queryByUsername(username);
+        //获取喜爱人数
+        Integer count = favoritesService.getCount(username);
+        //当喜爱数不匹配时进行更新
+        if (!result.getFavorites().equals(count)){
+            result.setFavorites(count);
+            Account account = new Account();
+            account.setUsername(result.getUsername());
+            account.setFavorites(count);
+            //更新数据
+            Boolean aBoolean = accountService.updateFavorites(account);
+            log.info(aBoolean.toString());
+        }
         return ResultMapUtils.ResultMap(true, 0, result);
     }
 
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/UserController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/UserController.java
@@ -36,6 +36,7 @@ public class UserController {
     private RedisTemplate redisTemplate;
 
 
+
     /**
      * 更新用户信息
      * @param account

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public PageInfo<Example> queryByPublic(String username, Integer currentPage) {`
`60`	`60`	`@Override`
`61`	`61`	`public void deleteExample(Integer exampleId) {`
`62`	`62`	`baseMapper.deleteExample(exampleId);`
	`63`	`+`
`63`	`64`	`}`
`64`	`65`
`65`	`66`