徽章列表

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/BadgeListFormDTO.java

@@ -19,7 +19,6 @@ public class BadgeListFormDTO implements Serializable {
     /**
      * 用户ID
      */
-    @NotBlank(message = "用户ID不能为空",groups = {BadgeList.class})
     private String userId;
 
     /**

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/OperListFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.resi.mine.dto.from;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:18 下午
+ */
+@Data
+public class OperListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1872129597916414752L;
+
+    public interface OperList{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {OperList.class})
+    private String customerId;
+}

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/BadgeListResultDTO.java

@@ -27,4 +27,6 @@ public class BadgeListResultDTO implements Serializable {
      * 徽章是否点亮
      */
     private String isOpened;
+
+    private String badgeType;
 }

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java

@@ -0,0 +1,46 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:20 下午
+ */
+@Data
+public class OperListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6185696177370545937L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章名字
+     */
+    private String badgeName;
+
+    /**
+     * 点亮状态 yes：已点亮，no：未点亮
+     */
+    private String isLighted;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 是否被驳回  true：已驳回，false：未驳回
+     */
+    private Boolean isReject;
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/controller/BadgeController.java

@@ -1,10 +1,14 @@
 package com.epmet.modules.badege.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.badege.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,10 +28,28 @@ public class BadgeController {
     @Autowired
     private BadgeService badgeService;
 
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
     @PostMapping("list")
-    public Result<List<BadgeListResultDTO>> getBadgeList(@RequestBody BadgeListFormDTO badgeListFormDTO){
+    public Result<List<BadgeListResultDTO>> getBadgeList(@LoginUser TokenDto tokenDto,@RequestBody BadgeListFormDTO badgeListFormDTO){
         ValidatorUtils.validateEntity(badgeListFormDTO, BadgeListFormDTO.BadgeList.class);
-        return new Result<List<BadgeListResultDTO>>().ok(badgeService.getBadgeList(badgeListFormDTO));
+        return new Result<List<BadgeListResultDTO>>().ok(badgeService.getBadgeList(tokenDto,badgeListFormDTO));
+    }
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @PostMapping("operlist")
+    public Result<List<OperListResultDTO>> getOperList(@LoginUser TokenDto tokenDto,@RequestBody OperListFormDTO operListFormDTO){
+        ValidatorUtils.validateEntity(operListFormDTO, OperListFormDTO.OperList.class);
+        return new Result<List<OperListResultDTO>>().ok(badgeService.getOperList(tokenDto,operListFormDTO));
     }
 
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/BadgeService.java

@@ -1,7 +1,10 @@
 package com.epmet.modules.badege.service;
 
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
 
 import java.util.List;
 
@@ -11,6 +14,20 @@ import java.util.List;
  */
 public interface BadgeService {
 
-    List<BadgeListResultDTO> getBadgeList(BadgeListFormDTO badgeListFormDTO);
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
+    List<BadgeListResultDTO> getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO);
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    List<OperListResultDTO> getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO);
 
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/badege/service/impl/BadgeServiceImpl.java

@@ -1,14 +1,19 @@
 package com.epmet.modules.badege.service.impl;
 
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.badege.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
+import com.epmet.resi.mine.dto.from.OperListFormDTO;
 import com.epmet.resi.mine.dto.result.BadgeListResultDTO;
+import com.epmet.resi.mine.dto.result.OperListResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,9 +32,17 @@ public class BadgeServiceImpl implements BadgeService {
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
+    /**
+     * @Description  个人中心-获取个人徽章点亮列表
+     * @Param badgeListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:11 下午
+     */
     @Override
-    public List<BadgeListResultDTO> getBadgeList(BadgeListFormDTO badgeListFormDTO) {
+    public List<BadgeListResultDTO> getBadgeList(TokenDto tokenDto,BadgeListFormDTO badgeListFormDTO) {
-        UserBadgeListFormDTO form = ConvertUtils.sourceToTarget(badgeListFormDTO, UserBadgeListFormDTO.class);
+        UserBadgeListFormDTO form = new UserBadgeListFormDTO();
+        form.setCustomerId(badgeListFormDTO.getCustomerId());
+        form.setUserId(tokenDto.getUserId());
         Result<List<UserBadgeListResultDTO>> listResult = epmetUserOpenFeignClient.selectBadgeList(form);
         if (!listResult.success()){
             throw new RenException("获取徽章点亮列表失败......");
@@ -40,4 +53,26 @@ public class BadgeServiceImpl implements BadgeService {
         List<BadgeListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), BadgeListResultDTO.class);
         return result;
     }
+
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @Override
+    public List<OperListResultDTO> getOperList(TokenDto tokenDto,OperListFormDTO operListFormDTO) {
+        UserOperListFormDTO userOperListFormDTO = new UserOperListFormDTO();
+        userOperListFormDTO.setCustomerId(operListFormDTO.getCustomerId());
+        userOperListFormDTO.setUserId(tokenDto.getUserId());
+        Result<List<UserOperListResultDTO>> listResult = epmetUserOpenFeignClient.selectOperList(userOperListFormDTO);
+        if (!listResult.success()){
+            throw new RenException("获取徽章列表失败......");
+        }
+        if (null == listResult.getData()){
+            return new ArrayList<>();
+        }
+        List<OperListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), OperListResultDTO.class);
+        return result;
+    }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java

@@ -12,4 +12,12 @@ public interface BadgeConstant {
 
     String DEFAULT_CUSTOMER = "default";
 
+    String YES = "yes";
+
+    String NO = "no";
+
+    String REJECTED = "rejected";
+
+    String APPROVED = "approved";
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserBadgeListFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -12,7 +11,7 @@ import java.io.Serializable;
 @Data
 public class UserBadgeListFormDTO implements Serializable {
 
-    private static final long serialVersionUID = 9082922684993474574L;
+    private static final long serialVersionUID = 9002922684993474574L;
 
     /**
      * 用户ID
@@ -23,4 +22,12 @@ public class UserBadgeListFormDTO implements Serializable {
      * 客户ID
      */
     private String customerId;
+
+    public UserBadgeListFormDTO(String userId, String customerId) {
+        this.userId = userId;
+        this.customerId = customerId;
+    }
+
+    public UserBadgeListFormDTO() {
+    }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserOperListFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:18 下午
+ */
+@Data
+public class UserOperListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1872129597916414712L;
+
+    private String userId;
+
+    private String customerId;
+
+    public UserOperListFormDTO(String userId, String customerId) {
+        this.userId = userId;
+        this.customerId = customerId;
+    }
+
+    public UserOperListFormDTO() {
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBadgeListResultDTO.java

@@ -28,6 +28,9 @@ public class UserBadgeListResultDTO implements Serializable {
      * 徽章是否点亮
      */
     private String isOpened;
+
+    private String badgeType;
+
     @JsonIgnore
     private String customerId;
     @JsonIgnore

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java

@@ -0,0 +1,62 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/3 4:20 下午
+ */
+@Data
+public class UserOperListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6185696177370545937L;
+
+    /**
+     * 徽章ID
+     */
+    private String badgeId;
+
+    /**
+     * 徽章名字
+     */
+    private String badgeName;
+
+    /**
+     * 点亮状态 yes：已点亮，no：未点亮
+     */
+    private String isLighted;
+
+    /**
+     * 是否认证 yes 认证 no 已认证
+     */
+    private String isCertificated;
+
+    /**
+     * 徽章图片地址
+     */
+    private String badgeIcon;
+
+    /**
+     * 是否被驳回  true：已驳回，false：未驳回
+     */
+    private Boolean isReject;
+
+    @JsonIgnore
+    private String customerId;
+    @JsonIgnore
+    private String isOpened;
+    @JsonIgnore
+    private String auditStatus;
+
+    public UserOperListResultDTO() {
+        this.badgeId = "";
+        this.badgeName = "";
+        this.isLighted = "no";
+        this.isCertificated = "no";
+        this.badgeIcon = "";
+        this.isReject = false;
+    }
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -347,4 +347,12 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/badge/badgelist")
     Result<List<UserBadgeListResultDTO>> selectBadgeList(@RequestBody UserBadgeListFormDTO userBadgeListFormDTO);
 
+    /**
+     * @Description 个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param operListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:28 下午
+     */
+    @PostMapping("/epmetuser/badge/badgeoperlist")
+    Result<List<UserOperListResultDTO>> selectOperList(@RequestBody UserOperListFormDTO userOperListFormDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -230,4 +230,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<UserBadgeListResultDTO>> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectBadgeList", userBadgeListFormDTO);
     }
+
+    @Override
+    public Result<List<UserOperListResultDTO>> selectOperList(UserOperListFormDTO userOperListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectOperList", userOperListFormDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java

@@ -2,7 +2,9 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.service.UserBadgeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,4 +36,15 @@ public class UserBadgeController {
         return new Result<List<UserBadgeListResultDTO>>().ok(userBadgeService.selectBadgeList(userBadgeListFormDTO));
     }
 
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    @PostMapping("badgeoperlist")
+    public Result<List<UserOperListResultDTO>> selectOperList(@RequestBody UserOperListFormDTO userOperListFormDTO){
+        return new Result<List<UserOperListResultDTO>>().ok(userBadgeService.selectOperList(userOperListFormDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java

@@ -2,7 +2,9 @@ package com.epmet.dao;
 
 import com.epmet.dto.form.UserBadgeListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,4 +31,20 @@ public interface UserBadgeDao {
      */
     List<UserBadgeListResultDTO> selectAllBadge(UserBadgeListFormDTO userBadgeListFormDTO);
 
+    /**
+     * @Description  查询徽章认证记录
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/3 5:25 下午
+     */
+    List<UserOperListResultDTO> selectAuthRecord(@Param("userId")String userId);
+
+    /**
+     * @Description  根据UserId查询个人徽章点亮信息
+     * @Param userId
+     * @author zxc
+     * @date 2020/11/4 9:32 上午
+     */
+    List<UserOperListResultDTO> selectBadgeByUserId(@Param("userId")String userId);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java

@@ -28,12 +28,9 @@ public class UserBadgeRedis {
      * @author zxc
      * @date 2020/11/3 2:50 下午
      */
-    public List<UserBadgeListResultDTO> getUserBadge(String customerId){
+    public Object getUserBadge(String customerId){
         Object userBadge = redisUtils.hGet(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE);
-        if (null == userBadge){
+        return userBadge;
-            return new ArrayList<>();
-        }
-        return JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java

@@ -1,7 +1,9 @@
 package com.epmet.service;
 
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
 
 import java.util.List;
 
@@ -19,4 +21,12 @@ public interface UserBadgeService {
      */
     List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO);
 
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -1,9 +1,14 @@
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.dao.UserBadgeDao;
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
+import com.epmet.dto.result.UserOperListResultDTO;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.service.UserBadgeService;
 import lombok.extern.slf4j.Slf4j;
@@ -38,8 +43,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public List<UserBadgeListResultDTO> selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) {
-            List<UserBadgeListResultDTO> userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
+        Object userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
-        if (CollectionUtils.isEmpty(userBadge)){
+        if (null == userBadge){
             List<UserBadgeListResultDTO> resultUserBadge = new ArrayList<>();
             List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectAllBadge(userBadgeListFormDTO);
             if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){
@@ -54,14 +59,15 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                     });
                 });
                 userBadgeRedis.setUserBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId());
+                userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
             }
         }
-        userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId());
+        List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
         List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO);
         if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
-            return userBadge;
+            return redisUserBadgeList;
         }
-        userBadge.forEach(u -> {
+        redisUserBadgeList.forEach(u -> {
             userBadgeListResultDTOS.forEach(badge -> {
                 if (u.getBadgeId().equals(badge.getBadgeId())){
                     badge.setBadgeIcon(u.getBadgeIcon());
@@ -69,11 +75,52 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 }
             });
         });
-        userBadge.forEach(u -> {
+        redisUserBadgeList.forEach(u -> {
             if (!u.getStatus()){
                 userBadgeListResultDTOS.add(u);
             }
         });
         return userBadgeListResultDTOS;
     }
+
+    /**
+     * @Description  个人中心-获取徽章可操作列表（点亮，取消，认证）
+     * @Param userOperListFormDTO
+     * @author zxc
+     * @date 2020/11/3 4:42 下午
+     */
+    @Override
+    public List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO) {
+        List<UserOperListResultDTO> userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId());
+        Object userBadge = userBadgeRedis.getUserBadge(userOperListFormDTO.getCustomerId());
+        List<UserOperListResultDTO> userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class);
+        // 没有任何记录
+        if (CollectionUtils.isEmpty(userAuthBadgeList)){
+            userOperListResultDTOS.forEach(u -> {
+                u.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
+                u.setIsCertificated(BadgeConstant.NO);
+                u.setIsReject(false);
+            });
+            return userOperListResultDTOS;
+        }
+        List<UserOperListResultDTO> badgeIsOpenedList = userBadgeDao.selectBadgeByUserId(userOperListFormDTO.getUserId());
+        userOperListResultDTOS.forEach(ub -> {
+            userAuthBadgeList.forEach(u -> {
+                if (ub.getBadgeId().equals(u.getBadgeId())){
+                    ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED) ? true : false);
+                    ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO);
+                }
+            });
+            if (CollectionUtils.isEmpty(badgeIsOpenedList)){
+                ub.setIsLighted(BadgeConstant.NO);
+            }else {
+                badgeIsOpenedList.forEach(b -> {
+                    if (ub.getBadgeId().equals(b.getBadgeId())){
+                        ub.setIsLighted(b.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
+                    }
+                });
+            }
+        });
+        return userOperListResultDTOS;
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -7,14 +7,14 @@
     <select id="selectBadgeList" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
         SELECT
             ub.BADGE_ID,
-            ub.IS_OPENED
+            ub.IS_OPENED,
-        FROM
+            b.FIXATION_BADGE_TYPE as badgeType
-            resi_user_badge ub
+        FROM resi_user_badge ub
-        WHERE
+        LEFT JOIN badge b ON b.ID = ub.BADGE_ID
-            ub.DEL_FLAG = 0
+        WHERE ub.DEL_FLAG = '0'
+            AND b.DEL_FLAG = 0
             AND ub.CERTIFICATION_AUTID_STATUS = 'pass'
-            AND ub.IS_OPENED = 1
+            AND b.CUSTOMER_ID = 'default'
-            AND ub.CUSTOMER_ID = #{customerId}
             AND ub.USER_ID = #{userId}
             ORDER BY ub.UPDATED_TIME DESC
     </select>
@@ -26,12 +26,37 @@
             CUSTOMER_ID,
             BADGE_NAME,
             BADGE_ICON,
-            FIXATION_BADGE_TYPE
+            FIXATION_BADGE_TYPE AS badgeType
         FROM badge
         WHERE
             DEL_FLAG = '0'
             AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = 'zxc')
     </select>
 
+    <!-- 查询徽章认证记录 -->
+    <select id="selectAuthRecord" resultType="com.epmet.dto.result.UserOperListResultDTO">
+        SELECT
+            CUSTOMER_ID,
+            BADGE_ID,
+            CERTIFICATION_IMG,
+            AUDIT_STATUS
+        FROM user_badge_certificate_record
+        WHERE DEL_FLAG = 0
+            AND IS_LAST = 'yes'
+            AND USER_ID = #{userId}
+    </select>
+
+    <!-- 根据UserId查询个人徽章点亮信息 -->
+    <select id="selectBadgeByUserId" resultType="com.epmet.dto.result.UserOperListResultDTO">
+        SELECT
+            BADGE_ID,
+            IS_OPENED
+        FROM resi_user_badge
+        WHERE
+            DEL_FLAG = '0'
+            AND CERTIFICATION_AUTID_STATUS = 'pass'
+            AND USER_ID = #{userId}
+    </select>
+
 
 </mapper>