Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/user/vo/UserAccountMessageVo.java

+package com.mmc.csf.user.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/10/7 19:48
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class UserAccountMessageVo implements Serializable {
+    private static final long serialVersionUID = 7067111726018678883L;
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message = "userId")
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "性别" ,example = "1")
+    private Integer sex;
+    @ApiModelProperty(value = "年龄" ,example = "1")
+    private Integer birthday;
+
+    private Integer pilotId;
+    @ApiModelProperty(value = "能力" ,example = "1")
+    private List<String> abilityName;
+    @ApiModelProperty(value = "工作年限" ,example = "1")
+    private Integer yearsOfWorking;
+
+}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 0ca0dcbbec31cd245461403e1df6bc03bd0380df
+  newTag: 47a13343dd8403dd43cdbdbc151f2ffbda27ad70

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumCountDO.java

 package com.mmc.csf.release.entity.forum;
 
+import com.mmc.csf.user.vo.UserAccountMessageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,6 +42,9 @@ public class ForumCountDO implements Serializable {
     @ApiModelProperty(value = "是否关注",example = "true表示已关注 null没有关注")
     private Boolean status;
 
+    @ApiModelProperty(value = "实名认证的用户信息")
+    private UserAccountMessageVo userAccountMessageVo;
+
 
 
 }

release-service/src/main/java/com/mmc/csf/release/service/gambit/impl/GambitServiceImpl.java

@@ -21,6 +21,7 @@ import com.mmc.csf.release.gambit.dto.ForumGambitDTO;
 import com.mmc.csf.release.gambit.qo.*;
 import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 import com.mmc.csf.release.service.gambit.GambitService;
+import com.mmc.csf.user.vo.UserAccountMessageVo;
 import com.mmc.csf.user.vo.UserAccountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -293,7 +294,9 @@ public class GambitServiceImpl implements GambitService {
     public ResultBody userMessage(Integer userAccountId,Integer userId) {
       ForumCountDO forumCountDO= gambitDao.userMessage(userAccountId);
         int i= gambitDao.selectCountAttentions(userAccountId,userId);
-      //  int i = gambitDao.selectCountAttention(userId);
+        UserAccountMessageVo userAccountMessageVo = infoMessage(userAccountId);
+        forumCountDO.setUserAccountMessageVo(userAccountMessageVo);
+        //  int i = gambitDao.selectCountAttention(userId);
         if (i!=0){
             forumCountDO.setStatus(true);
         }
@@ -346,5 +349,21 @@ public class GambitServiceImpl implements GambitService {
         return userAccountVO;
     }
 
+    public UserAccountMessageVo infoMessage(Integer userAccountId) {
+        String token = null;
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(userAccountId.toString(), headers);
+        ResponseEntity<String> exchange = restTemplate.exchange(userApp + "/userapp/user-account/userMessages?userAccountId=" + userAccountId , HttpMethod.GET, entity, String.class);
+        Object body = exchange.getBody();
+        JSONObject jsonObject = JSONObject.parseObject((String) body);
+        JSONObject result1 = (JSONObject) jsonObject.get("result");
+        UserAccountMessageVo userAccountVO=null;
+        if (result1!=null){
+             userAccountVO = JSON.parseObject(result1.toJSONString(), UserAccountMessageVo.class);
+        }
+        return userAccountVO;
+    }
 
 }