From 879133b8c751b51d984e3817ac4614a73a430a38 Mon Sep 17 00:00:00 2001 From: 13036795865 Date: Tue, 27 May 2025 08:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E8=B7=83=E7=94=A8=E6=88=B7=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9=EF=BC=9B=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9D=A5=E6=BA=90=E7=BB=9F=E8=AE=A1=EF=BC=88?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=B8=8A=E6=9E=B6=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/ActivityUserTotal.java | 36 +++++++++++++++++++ .../mapper/BehaviorImageMapper.java | 7 ++-- .../service/IBehaviorImageService.java | 2 +- .../impl/BehaviorImageServiceImpl.java | 2 +- .../mapper/dms/AchievementsMapper.xml | 1 + .../mapper/dms/BehaviorImageMapper.xml | 28 ++++++++++----- 6 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/domain/ActivityUserTotal.java diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/domain/ActivityUserTotal.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/domain/ActivityUserTotal.java new file mode 100644 index 000000000..663bac382 --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/domain/ActivityUserTotal.java @@ -0,0 +1,36 @@ +package com.microservices.dms.behaviorImage.domain; + +import lombok.Data; + +public class ActivityUserTotal { + //活跃用户 + private Long totalUser; + //活跃用户专家数 + private Long totalExpert; + //活跃用户实名认证 + private Long authTotal; + + public Long getTotalUser() { + return totalUser; + } + + public void setTotalUser(Long totalUser) { + this.totalUser = totalUser; + } + + public Long getTotalExpert() { + return totalExpert; + } + + public void setTotalExpert(Long totalExpert) { + this.totalExpert = totalExpert; + } + + public Long getAuthTotal() { + return authTotal; + } + + public void setAuthTotal(Long authTotal) { + this.authTotal = authTotal; + } +} diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/mapper/BehaviorImageMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/mapper/BehaviorImageMapper.java index 44ca28b0f..60b0200a2 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/mapper/BehaviorImageMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/mapper/BehaviorImageMapper.java @@ -2,10 +2,7 @@ package com.microservices.dms.behaviorImage.mapper; import com.microservices.common.datasource.annotation.Slave; import com.microservices.dms.achievementLibrary.domain.KeyValueVo; -import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; -import com.microservices.dms.behaviorImage.domain.ActivityUserLibrary; -import com.microservices.dms.behaviorImage.domain.BehaviorImageWeight; -import com.microservices.dms.behaviorImage.domain.UserTypeTotalVo; +import com.microservices.dms.behaviorImage.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -98,7 +95,7 @@ public interface BehaviorImageMapper { List getUserTypeStatistic(@Param("userId")Long userId); - List getActivityStatistic(); + ActivityUserTotal getActivityStatistic(); List selectActivityUserLibraryListAll(ActivityUserLibrary activityUserLibrary); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/IBehaviorImageService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/IBehaviorImageService.java index bc326d9bd..526211e71 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/IBehaviorImageService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/IBehaviorImageService.java @@ -75,7 +75,7 @@ public interface IBehaviorImageService { UserExpertTotalVo getUserExpertStatistic(Long userId); - List getActivityStatistic(); + ActivityUserTotal getActivityStatistic(); UserTypeTotalVo getUserBehaviorSum(Long userId); } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/impl/BehaviorImageServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/impl/BehaviorImageServiceImpl.java index f38a6c5a5..2b8bad3eb 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/impl/BehaviorImageServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/behaviorImage/service/impl/BehaviorImageServiceImpl.java @@ -309,7 +309,7 @@ public class BehaviorImageServiceImpl implements IBehaviorImageService { } @Override - public List getActivityStatistic() { + public ActivityUserTotal getActivityStatistic() { return behaviorImageMapper.getActivityStatistic(); } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index b1698ce15..c300bc944 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -230,6 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/BehaviorImageMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/BehaviorImageMapper.xml index 7ce558091..865eacf60 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/BehaviorImageMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/BehaviorImageMapper.xml @@ -140,7 +140,7 @@ - + select count(1) as "totalUser",sum(r.isExpert) as "totalExpert",sum(r.enterprise_certification+r.authentication) as "authTotal" from ( + select res.userId,res.loginName,res.userName,res.isExpert,res.authentication,res.enterprise_certification,res.relatedCompetition,res.relatedTask,res.p1+res.p2+res.p3 as "relatedProject" from ( + select u.id as "userId",u.login as "loginName",u.nickname as "userName",u.is_expert as "isExpert",u.authentication,u.enterprise_certification, + (select count(1) as "value" from tasks where is_delete='0' and status between 3 and 8 and user_id =u.id) as "relatedTask", + (select count(1) from competition_infos ci inner join competition_users cu on ci.id = cu.competition_info_id where cu.user_id =u.id) as "relatedCompetition", + (SELECT count(1) as "pCount" FROM `projects` WHERE id != 0 AND user_id =u.id) as p1, + ( SELECT count(1) as "pCount" + FROM `projects` INNER JOIN `members` ON `members`.`project_id` = `projects`.`id` + WHERE `projects`.`id` != 0 AND `projects`.`user_id` !=u.id AND `members`.`user_id` =u.id) as p2, + (SELECT count(1) as "pCount" + FROM `projects` + INNER JOIN `team_projects` ON `team_projects`.`project_id` = `projects`.`id` + INNER JOIN `teams` ON `teams`.`id` = `team_projects`.`team_id` + INNER JOIN `team_users` ON `team_users`.`team_id` = `teams`.`id` + WHERE `projects`.`id` != 0 AND `team_users`.`user_id` =u.id) as p3 + from users u) res + where res.relatedCompetition >0 or res.relatedTask >0 or res.p1+res.p2+res.p3>0 )r