徽章点亮/取消点亮🛂

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

@@ -4,6 +4,7 @@ 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.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.modules.badege.service.BadgeService;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
 import com.epmet.dto.form.CertificationAddFormDTO;
@@ -67,5 +68,18 @@ public class BadgeController {
         return new Result();
     }
 
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @PostMapping("openedorclosed")
+    public Result openedOrClosed(@LoginUser TokenDto tokenDto,@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO){
+        ValidatorUtils.validateEntity(openedOrClosedFormDTO, OpenedOrClosedFormDTO.OpenedOrClosed.class);
+        badgeService.openedOrClosed(tokenDto,openedOrClosedFormDTO);
+        return new Result();
+    }
+
 
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.modules.badege.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.resi.mine.dto.from.BadgeListFormDTO;
 import com.epmet.dto.form.CertificationAddFormDTO;
 import com.epmet.resi.mine.dto.from.OperListFormDTO;
@@ -40,4 +41,12 @@ public interface BadgeService {
      */
     void certificationAdd(TokenDto tokenDto, CertificationAddFormDTO certificationAddFormDTO);
 
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    void openedOrClosed(TokenDto tokenDto,OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
 }

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

@@ -4,6 +4,7 @@ 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.OpenedOrClosedFormDTO;
 import com.epmet.dto.form.UserBadgeListFormDTO;
 import com.epmet.dto.form.UserOperListFormDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
@@ -92,4 +93,19 @@ public class BadgeServiceImpl implements BadgeService {
             throw new RenException("提交徽章认证失败......");
         }
     }
+
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @Override
+    public void openedOrClosed(TokenDto tokenDto,OpenedOrClosedFormDTO openedOrClosedFormDTO) {
+        openedOrClosedFormDTO.setUserId(tokenDto.getUserId());
+        Result result = epmetUserOpenFeignClient.openedOrClosed(openedOrClosedFormDTO);
+        if (!result.success()){
+            throw new RenException("取消/点亮徽章失败了......");
+        }
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 5:43 下午
+ */
+@Data
+public class OpenedOrClosedFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 483466676158603066L;
+
+    public interface OpenedOrClosed{}
+
+    @NotBlank(message = "客户ID不能为空",groups = {OpenedOrClosed.class})
+    private String customerId;
+
+    private String userId;
+
+    @NotBlank(message = "徽章ID不能为空",groups = {OpenedOrClosed.class})
+    private String badgeId;
+}

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

@@ -364,4 +364,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/more/badge/authbadgerecord")
     Result authBadgeRecord(@RequestBody CertificationAddFormDTO certificationAddFormDTO);
+
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/5 9:23 上午
+     */
+    @PostMapping("/epmetuser/more/badge/openedorclosed")
+    Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO);
 }

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

@@ -240,4 +240,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "authBadgeRecord", certificationAddFormDTO);
     }
+
+    @Override
+    public Result openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "openedOrClosed", openedOrClosedFormDTO);
+    }
 }

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

@@ -101,4 +101,16 @@ public class UserBadgeController {
         return new Result<List<AuthFieldResultDTO>>().ok(userBadgeService.authField(authFieldFormDTO));
     }
 
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    @PostMapping("openedorclosed")
+    public Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO){
+        userBadgeService.openedOrClosed(openedOrClosedFormDTO);
+        return new Result();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.epmet.dao;
 
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.AuthFieldFormDTO;
+import com.epmet.dto.form.OpenedOrClosedFormDTO;
 import com.epmet.dto.form.UserBadgeListFormDTO;
 import com.epmet.dto.result.AuthFieldResultDTO;
 import com.epmet.dto.result.CertificationDetailResultDTO;
@@ -84,4 +85,11 @@ public interface UserBadgeDao {
      * @date 2020/11/4 5:05 下午
      */
     List<AuthFieldResultDTO> selectAuthField(AuthFieldFormDTO authFieldFormDTO);
+    /**
+     * @Description  个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 6:04 下午
+     */
+    void updateIsOpen(OpenedOrClosedFormDTO openedOrClosedFormDTO);
 }

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

@@ -65,4 +65,12 @@ public interface UserBadgeService {
      */
     List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO);
 
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    void openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
 }

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

@@ -16,7 +16,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.UserBadgeRedis;
-import com.epmet.service.CustomerStaffService;
 import com.epmet.service.UserBadgeService;
 import com.epmet.service.UserBaseInfoService;
 import lombok.extern.slf4j.Slf4j;
@@ -223,4 +222,15 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         return authFieldResultDTOS;
     }
 
+    /**
+     * @Description 个人中心-取消/点亮徽章
+     * @Param openedOrClosedFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:47 下午
+     */
+    @Override
+    public void openedOrClosed(OpenedOrClosedFormDTO openedOrClosedFormDTO) {
+        userBadgeDao.updateIsOpen(openedOrClosedFormDTO);
+    }
+
 }

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

@@ -12,6 +12,16 @@
           AND USER_ID = #{userId}
     </update>
 
+    <!-- 个人中心-取消/点亮徽章 -->
+    <update id="updateIsOpen">
+        UPDATE resi_user_badge
+        SET IS_OPENED = (case when IS_OPENED = 1 THEN 0 ELSE 1 END),
+            UPDATED_TIME = NOW()
+        WHERE DEL_FLAG = '0'
+          AND USER_ID = #{userId}
+          AND BADGE_ID = #{badgeId}
+    </update>
+
     <!-- 查询已经点亮的徽章 -->
     <select id="selectBadgeList" resultType="com.epmet.dto.result.UserBadgeListResultDTO">
         SELECT