UserAccountService(add)

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

+package com.mmc.iuav.user.model.vo;
+
+import com.mmc.iuav.group.Update;
+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:23
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class UserAccountMessageVo implements Serializable {
+    private static final long serialVersionUID = 7067111726018678883L;
+    @ApiModelProperty(value = "用户id")
+    @NotNull(message = "userId", groups = {Update.class})
+    private Integer userAccountId;
+
+    private Integer sex;
+
+    private Integer birthday;
+
+    private Integer pilotId;
+
+    private List<String> abilityName;
+
+    private Integer yearsOfWorking;
+
+
+
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
+import com.mmc.iuav.user.model.vo.UserAccountMessageVo;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.service.UserAccountService;
 import io.swagger.annotations.*;
@@ -175,8 +176,11 @@ public class UserAccountController extends BaseController {
         return ResultBody.success(userAccountService.getUserAccountById(userAccountId));
     }
 
-
-
-
+    @ApiOperation(value = "用户信息年龄等")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserAccountMessageVo.class)})
+    @GetMapping("userMessages")
+    public ResultBody<UserAccountMessageVo> userMessages(HttpServletRequest request, Integer userAccountId) {
+        return ResultBody.success(userAccountService.userMessages(userAccountId));
+    }
 
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/UserServiceDao.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.entity.fdd.UserFddDO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
+import com.mmc.iuav.user.model.vo.UserAccountMessageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -195,4 +196,8 @@ public interface UserServiceDao {
     int selectUserAccountNickName(UserAccountDO userAccountDO);
 
     String getDistrictChild(Integer districtChildId);
+
+    UserAccountMessageVo userMessages(Integer userAccountId);
+
+    List<String> userMessagesPilot(Integer pilotId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserAccountService.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
+import com.mmc.iuav.user.model.vo.UserAccountMessageVo;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 
 import java.util.List;
@@ -168,4 +169,6 @@ public interface UserAccountService {
     ResultBody updatePhoneNum(Integer userAccountId, String verifyCode);
 
     ResultBody appUpdateUser(UserMessageQO userMessageQO);
+
+    UserAccountMessageVo userMessages(Integer userAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -19,10 +19,7 @@ import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.qo.UserMessageQO;
 import com.mmc.iuav.user.model.qo.UserRcdQO;
-import com.mmc.iuav.user.model.vo.CompanyAuthVO;
-import com.mmc.iuav.user.model.vo.CooperationTagVO;
-import com.mmc.iuav.user.model.vo.TopInviteVO;
-import com.mmc.iuav.user.model.vo.UserAccountVO;
+import com.mmc.iuav.user.model.vo.*;
 import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
 import com.mmc.iuav.user.mq.MqProducer;
 import com.mmc.iuav.user.service.CompanyAuthService;
@@ -517,5 +514,15 @@ public class UserAccountServiceImpl implements UserAccountService {
         return ResultBody.success();
     }
 
+    @Override
+    public UserAccountMessageVo userMessages(Integer userAccountId) {
+       UserAccountMessageVo user = userServiceDao.userMessages(userAccountId);
+       if (user!=null){
+           List<String> strings = userServiceDao.userMessagesPilot(user.getPilotId());
+           user.setAbilityName(strings);
+       }
+        return user;
+    }
+
 
 }

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -596,4 +596,29 @@
 	AND p2.id = #{districtChildId}
     </select>
 
+    <select id="userMessages" resultType="com.mmc.iuav.user.model.vo.UserAccountMessageVo">
+        SELECT
+            rna.user_account_id as userAccountId,
+            rna.sex,
+            (
+                YEAR (
+                CURDATE())- YEAR ( birthday )) AS birthday,
+            pc.id as pilotId,
+            pc.years_of_working
+        FROM
+            real_name_auth rna
+                INNER JOIN pilot_certification pc ON rna.user_account_id = pc.user_account_id
+        WHERE
+            rna.user_account_id = #{userAccountId}
+    </select>
+
+    <select id="userMessagesPilot" resultType="java.lang.String">
+        SELECT
+            ability_name
+        FROM
+            pilot_ability_certification pac
+        WHERE
+            pilot_certification_id = #{pilotId}
+    </select>
+
 </mapper>

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -39,4 +39,5 @@ data-filter:
     - /userapp/fdd/auth/notifyECertRes
     - /userapp/user-account/interiorInfo
     - /userapp/user/report/getJoinStoreNumber
+    - /userapp/user-account/userMessages