徽章

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

@@ -30,4 +30,16 @@ public interface BadgeConstant {
 
     String OFFLINE ="offline";
 
+    String RESI = "resi";
+
+    String AUTH_TITLE = "您有一条认证消息";
+
+    String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......";
+
+    String MESSAGE_CONTENT = "您好，您的%s因认证失败未成功点亮，请查看";
+
+    String READ_FLAG = "unread";
+
+    String DEFAULT = "default";
+
 }

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

@@ -36,6 +36,15 @@ public interface UserBadgeDao {
      */
     List<UserBadgeListResultDTO> selectAllBadge(@Param("customerId") String customerId);
 
+    /**
+     * @Description  查询单个徽章信息
+     * @Param customerId
+     * @Param badgeId
+     * @author zxc
+     * @date 2020/11/9 11:17 上午
+     */
+    UserBadgeListResultDTO selectBadgeByBadgeId(@Param("customerId") String customerId,@Param("badgeId") String badgeId);
+
     /**
      * @Description  查询徽章认证记录
      * @Param userId

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

@@ -20,7 +20,6 @@ import com.epmet.service.UserBadgeService;
 import com.epmet.service.UserBaseInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,8 +27,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author zxc
@@ -47,6 +44,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     private UserBaseInfoService userBaseInfoService;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient messageFeignClient;
 
     /**
      * @Description  查询已经点亮的徽章
@@ -151,9 +150,32 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         form.setCertificationImg(certificationAddFormDTO.getCertificationImg());
         form.setSurname(certificationAddFormDTO.getSurname());
         userBadgeDao.insertUserBadgeCertificateRecord(form);
+
+        //TODO 站内信发送  您好，您的xxx徽章因认证失败未成功点亮，请查看
+
+
         return new Result();
     }
 
+    public void sendMessageByUser(UserBadgeCertificateRecordDTO form){
+        List<UserMessageFormDTO> msgList = new ArrayList<>();
+        UserMessageFormDTO formDTO = new UserMessageFormDTO();
+        formDTO.setApp(BadgeConstant.RESI);
+        formDTO.setCustomerId(form.getCustomerId());
+        formDTO.setGridId(form.getGridId());
+        UserBadgeListResultDTO userBadgeListResultDTO = userBadgeDao.selectBadgeByBadgeId(form.getCustomerId(), form.getBadgeId());
+        if (null == userBadgeListResultDTO){
+            log.error(BadgeConstant.GET_BADGE_NAME_FAILURE);
+            return;
+        }
+        formDTO.setMessageContent(String.format(BadgeConstant.MESSAGE_CONTENT,userBadgeListResultDTO.getBadgeName()));
+        formDTO.setTitle(BadgeConstant.AUTH_TITLE);
+        formDTO.setReadFlag(BadgeConstant.READ_FLAG);
+        formDTO.setUserId(form.getUserId());
+        msgList.add(formDTO);
+        Result result = messageFeignClient.saveUserMessageList(msgList);
+    }
+
     /**
      * @Description  发送验证码
      * @Param badgeSendCodeFormDTO
@@ -205,7 +227,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     public List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO) {
         List<AuthFieldResultDTO> authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO);
         if (CollectionUtils.isEmpty(authFieldResultDTOS)){
-            return new ArrayList<>();
+            authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT);
+            return userBadgeDao.selectAuthField(authFieldFormDTO);
         }
         return authFieldResultDTOS;
     }

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

@@ -126,6 +126,28 @@
             AND cc.BADGE_ID = #{badgeId}
             ORDER BY cf.SORT
     </select>
+    <select id="selectBadgeByBadgeId" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
+        SELECT
+            ID AS badgeId,
+            BADGE_NAME,
+            BADGE_ICON,
+            BADGE_STATUS
+        FROM
+            (
+                SELECT * FROM badge
+                WHERE CUSTOMER_ID = #{customerId}
+                  AND DEL_FLAG = '0'
+                  AND ID = #{badgeId}
+                UNION ALL
+                SELECT * FROM badge a
+                WHERE CUSTOMER_ID = 'default'
+                  AND a.DEL_FLAG = '0'
+                  AND BADGE_STATUS = 'online'
+                  AND ID = #{badgeId}
+                  AND NOT EXISTS
+                    ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)
+            ) t
+    </select>
 
     <!--  徽章审核记录表插入  -->
     <insert id="insertUserBadgeCertificateRecord">