个人中心-查询徽章要显示的认证信息字段

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

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

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

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/4 4:54 下午
+ */
+@Data
+public class AuthFieldResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1856490232343125419L;
+
+    /**
+     * 中文名
+     */
+    private String cnName;
+
+    /**
+     * 英文名【字段】
+     */
+    private String enName;
+
+    /**
+     * 字段类型，text：文本，img：图片
+     */
+    private String fieldType;
+
+    /**
+     * 是否必填
+     */
+    private String isRequired;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

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

@@ -5,6 +5,7 @@ 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.*;
+import com.epmet.dto.result.AuthFieldResultDTO;
 import com.epmet.dto.result.CertificationDetailResultDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
@@ -88,4 +89,16 @@ public class UserBadgeController {
         return new Result<CertificationDetailResultDTO>().ok(userBadgeService.certificationDetail(tokenDto,certificationDetailFormDTO));
     }
 
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    @PostMapping("authfield")
+    public Result<List<AuthFieldResultDTO>> authField(@RequestBody AuthFieldFormDTO authFieldFormDTO){
+        ValidatorUtils.validateEntity(authFieldFormDTO, AuthFieldFormDTO.AuthField.class);
+        return new Result<List<AuthFieldResultDTO>>().ok(userBadgeService.authField(authFieldFormDTO));
+    }
+
 }

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

@@ -1,7 +1,9 @@
 package com.epmet.dao;
 
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
+import com.epmet.dto.form.AuthFieldFormDTO;
 import com.epmet.dto.form.UserBadgeListFormDTO;
+import com.epmet.dto.result.AuthFieldResultDTO;
 import com.epmet.dto.result.CertificationDetailResultDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
@@ -74,4 +76,12 @@ public interface UserBadgeDao {
      * @date 2020/11/4 4:09 下午
      */
     CertificationDetailResultDTO selectBadgeAuthRecord(@Param("userId")String userId, @Param("badgeId")String badgeId);
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    List<AuthFieldResultDTO> selectAuthField(AuthFieldFormDTO authFieldFormDTO);
 }

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

@@ -1,13 +1,12 @@
 package com.epmet.service;
 
-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.dto.form.*;
+import com.epmet.dto.result.AuthFieldResultDTO;
 import com.epmet.dto.result.CertificationDetailResultDTO;
 import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.dto.result.UserOperListResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -58,4 +57,12 @@ public interface UserBadgeService {
      */
     CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO);
 
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO);
+
 }

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

@@ -46,8 +46,6 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     @Autowired
     private UserBaseInfoService userBaseInfoService;
     @Autowired
-    private CustomerStaffService customerStaffService;
-    @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
@@ -209,4 +207,20 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
     }
 
+
+    /**
+     * @Description  个人中心-查询徽章要显示的认证信息字段
+     * @Param authFieldFormDTO
+     * @author zxc
+     * @date 2020/11/4 5:05 下午
+     */
+    @Override
+    public List<AuthFieldResultDTO> authField(AuthFieldFormDTO authFieldFormDTO) {
+        List<AuthFieldResultDTO> authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO);
+        if (CollectionUtils.isEmpty(authFieldResultDTOS)){
+            return new ArrayList<>();
+        }
+        return authFieldResultDTOS;
+    }
+
 }

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

@@ -92,6 +92,23 @@
             AND USER_ID = #{userId}
     </select>
 
+    <!-- 个人中心-查询徽章要显示的认证信息字段 -->
+    <select id="selectAuthField" resultType="com.epmet.dto.result.AuthFieldResultDTO">
+        SELECT
+            cf.CN_NAME,
+            cf.EN_NAME,
+            cf.FIELD_TYPE,
+            cf.IS_REQUIRED,
+            cf.SORT
+        FROM badge_certification_config_field cf
+        LEFT JOIN badge_certification_config cc ON cc.CERTIFICATION_TYPE = cf.CERTIFICATION_TYPE
+        WHERE cf.DEL_FLAG = 0
+            AND cc.DEL_FLAG = 0
+            AND cc.CUSTOMER_ID = #{customerId}
+            AND cc.BADGE_ID = #{badgeId}
+            ORDER BY cf.SORT
+    </select>
+
     <!--  徽章审核记录表插入  -->
     <insert id="insertUserBadgeCertificateRecord">
         INSERT INTO user_badge_certificate_record (