获取热门成果的人员图片和信息

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/HotAchVo.java

@@ -0,0 +1,86 @@
+package com.microservices.dms.achievementLibrary.domain;
+
+public class HotAchVo {
+
+    private int watcher;
+    private int faviter;
+    private int total;
+    private String gender;
+    private String name;
+    private Long id;
+    private String userNickName;
+    private String userName;
+    private String userImg;
+
+    public String getUserImg() {
+        return userImg;
+    }
+
+    public void setUserImg(String userImg) {
+        this.userImg = userImg;
+    }
+
+    public int getWatcher() {
+        return watcher;
+    }
+
+    public void setWatcher(int watcher) {
+        this.watcher = watcher;
+    }
+
+    public int getFaviter() {
+        return faviter;
+    }
+
+    public void setFaviter(int faviter) {
+        this.faviter = faviter;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUserNickName() {
+        return userNickName;
+    }
+
+    public void setUserNickName(String userNickName) {
+        this.userNickName = userNickName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java

@@ -91,7 +91,7 @@ public interface AchievementsMapper {
 
     List<KeyValVo<String, Long>> getAchievement(@Param("s") Date s, @Param("e") Date e, @Param("t") String source);
 
-    List<Map<String, String>> getHotAchievement();
+    List<HotAchVo> getHotAchievement();
 
     Map<String, Long> indexProjectStatistic();
 

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java

@@ -76,7 +76,7 @@ public interface IAchievementsService {
 
     Map<String, Object> getUerActionData();
 
-    List<Map<String, String>> getHotAchievement();
+    List<HotAchVo> getHotAchievement();
 
     List<KeyValVo<String, Long>> get7DayAdd(AchQueryVo achQueryVo);
 

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java

@@ -72,9 +72,11 @@ public class AchievementsServiceImpl implements IAchievementsService {
         Achievements a = achievementsMapper.selectAchievementsById(id);
         if(StringUtils.isNotNull(a)){
             String gender = a.getGender();
-            String img = "images/avatars/User/boy.jpg";
+            String img = "";
             if(StringUtils.isNotEmpty(gender) && gender.equals("1")){
                 img = "images/avatars/User/girl.jpg";
+            } else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) {
+                img = "images/avatars/User/boy.jpg";
             }
             a.setUserImg(img);
             if(StringUtils.isNotEmpty(a.getField1())) {
@@ -102,9 +104,11 @@ public class AchievementsServiceImpl implements IAchievementsService {
         List<Achievements> list = achievementsMapper.selectAchievementsList(achievements);
         for (Achievements a : list) {
             String gender = a.getGender();
-            String img = "images/avatars/User/boy.jpg";
+            String img = "";
             if(StringUtils.isNotEmpty(gender) && gender.equals("1")){
                 img = "images/avatars/User/girl.jpg";
+            }else if (StringUtils.isNotEmpty(gender) && gender.equals("0")) {
+                img = "images/avatars/User/boy.jpg";
             }
             a.setUserImg(img);
             //根据id获取领域名称
@@ -234,9 +238,11 @@ public class AchievementsServiceImpl implements IAchievementsService {
         //遍历成果数据，获取对应成果的点击数
         for (Achievements a : list) {
             String gender = a.getGender();
-            String img = "images/avatars/User/boy.jpg";
+            String img = "";
             if(StringUtils.isNotEmpty(gender) && gender.equals("1")){
                 img = "images/avatars/User/girl.jpg";
+            }else if(StringUtils.isNotEmpty(gender) && gender.equals("0")){
+                img = "images/avatars/User/boy.jpg";
             }
             a.setUserImg(img);
             //根据id获取领域名称
@@ -284,8 +290,21 @@ public class AchievementsServiceImpl implements IAchievementsService {
     }
 
     @Override
-    public List<Map<String, String>> getHotAchievement() {
-        return achievementsMapper.getHotAchievement();
+    public List<HotAchVo> getHotAchievement() {
+        //根据查询条件获取所有的成果数据
+        List<HotAchVo>  resultList = achievementsMapper.getHotAchievement();
+        //遍历成果数据，获取对应成果的点击数
+        for (HotAchVo a : resultList) {
+            String gender = a.getGender();
+            String img = "";
+            if(StringUtils.isNotEmpty(gender) && gender.equals("1")){
+                img = "images/avatars/User/girl.jpg";
+            }else if (StringUtils.isNotEmpty(gender) && gender.equals("0")){
+                img = "images/avatars/User/boy.jpg";
+            }
+            a.setUserImg(img);
+        }
+        return resultList;
     }
 
     @Override

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

@@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getChoiceImport" resultType="com.microservices.dms.achievementLibrary.domain.Achievements">
-        select id, achievement_name,images,field_1,field_2,field_3,source,source_id
+        select id, achievement_name,images,field_1,field_2,field_3,a.summary,source,source_id
         from achievements
         where is_featured ='1'
         order by update_time desc
@@ -333,14 +333,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by DATE_FORMAT(created_at, '%m-%d')
     </select>
 
-    <select id="getHotAchievement" resultType="java.util.Map">
+    <select id="getHotAchievement" resultType="com.microservices.dms.achievementLibrary.domain.HotAchVo">
         select t.achievement_name as name, t.w as watcher, t.f as faviter, (t.w + t.f) as total, t.id as `id`,t.owner_name
-                as userName
+                as userName,t.gender,t.userNickName
         from (select a.achievement_name,
                      a.id,a.owner_name,
+                     IFNULL(u.nickname,a.owner_name) as "userNickName",
+                     ue.gender as "gender",
                      (select IFNULL(count(*), 0) from favorites where favorite_type = 'Achievements' and favorite_id = a.id)  as f,
                      (select IFNULL(count(*), 0) from watchers where watchable_type = 'Achievements' and watchable_id = a.id) as w
-              from achievements a) as t
+              from achievements a
+               left join users u on a.owner_name = u.login
+               left join user_extensions ue on u.id = ue.user_id
+              ) as t
         order by (f+w) desc
         limit 0,3
     </select>