Merge remote-tracking branch 'origin/feat_chievements_dev' into feat_chievements_dev

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/controller/BehaviorImageController.java

@@ -171,4 +171,12 @@ public class BehaviorImageController extends BaseController {
     {
         return  AjaxResult.success(behaviorImageService.getActivityStatistic());
     }
+
+
+    @GetMapping(value = "/getUserBehaviorSum")
+    @ApiOperation("获取用户的所有关注、点赞数")
+    public AjaxResult getUserBehaviorSum(Long userId)
+    {
+        return  AjaxResult.success(behaviorImageService.getUserBehaviorSum(userId));
+    }
 }

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/controller/BlockChainController.java

@@ -1,18 +0,0 @@
-package com.microservices.dms.behaviorImage.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 区块链Controller
- *
- * @author microservices
- * @date 2025-04-17
- */
-@RestController
-@RequestMapping("/blockChain")
-@Api(tags = "数据产权子系统")
-public class BlockChainController {
-    //查询所有上链的项目select * from projects where use_blockchain='1'
-}

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/mapper/BehaviorImageMapper.java

@@ -101,4 +101,6 @@ public interface BehaviorImageMapper {
     List<KeyValueVo> getActivityStatistic();
 
     List<ActivityUserLibrary> selectActivityUserLibraryListAll(ActivityUserLibrary activityUserLibrary);
+
+    UserTypeTotalVo getUserBehaviorSum(@Param("userId")Long userId);
 }

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/IBehaviorImageService.java

@@ -76,4 +76,6 @@ public interface IBehaviorImageService {
     UserExpertTotalVo getUserExpertStatistic(Long userId);
 
     List<KeyValueVo> getActivityStatistic();
+
+    UserTypeTotalVo getUserBehaviorSum(Long userId);
 }

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/impl/BehaviorImageServiceImpl.java

@@ -339,4 +339,9 @@ public class BehaviorImageServiceImpl implements IBehaviorImageService {
         List<ActivityUserLibrary> list = behaviorImageMapper.selectActivityUserLibraryListAll(activityUserLibrary);
         return list;
     }
+
+    @Override
+    public UserTypeTotalVo getUserBehaviorSum(Long userId) {
+        return behaviorImageMapper.getUserBehaviorSum(userId);
+    }
 }

microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/BehaviorImageMapper.xml

@@ -315,4 +315,13 @@
                                                                       inner join experts e on u.id = e.user_id
         where e.is_delete='0'  and e.status = 1
     </select>
+
+    <select id="getUserBehaviorSum" resultType="com.microservices.dms.behaviorImage.domain.UserTypeTotalVo">
+    select
+        (select count(1) as "resultCount" from watchers where user_id = u.id ) as "watchSum",
+        (select count(1) as "resultCount" from favorites where user_id = u.id ) as "favoriteSum",
+        (select count(1) as "resultCount" from praise_treads where user_id = u.id ) as "praiseSum"
+    from users u
+    where u.id = #{userId}
+    </select>
 </mapper>