添加用户状态字段

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

@@ -97,4 +97,6 @@ public class UserAccountVO implements Serializable {
     private Integer backUserId;
     @ApiModelProperty(value = "密码")
     private String password;
+    @ApiModelProperty(value = "用户状态")
+    private String userState;
 }

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

@@ -195,4 +195,11 @@ public class UserAccountController extends BaseController {
         return ResultBody.success(userAccountService.userMessages(userAccountId));
     }
 
+    @ApiOperation(value = "用户状态列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getStateList")
+    public ResultBody getStateList() {
+        return userAccountService.getStateList();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.dao;
 
 import com.mmc.iuav.user.entity.UserAccountDO;
 import com.mmc.iuav.user.entity.UserRcdDO;
+import com.mmc.iuav.user.entity.UserStateDO;
 import com.mmc.iuav.user.entity.data.ActiveUserCountDO;
 import com.mmc.iuav.user.entity.fdd.UserFddDO;
 import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
@@ -257,4 +258,6 @@ public interface UserServiceDao {
 
 
     UserAccountDO getUserAccountInfoByPhoneNum(String phoneNum);
+
+    List<UserStateDO> getStateList();
 }

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

@@ -91,6 +91,8 @@ public class UserAccountDO implements Serializable {
     private Integer districtChildId;
     //web端登录密码
     private String password;
+    @ApiModelProperty(value = "用户状态")
+    private String userState;
     public UserAccountDO(UserAccountVO userAccountVO) {
         this.id = userAccountVO.getId();
         this.phoneNum = userAccountVO.getPhoneNum();
@@ -139,6 +141,7 @@ public class UserAccountDO implements Serializable {
                 .coverPicture(this.coverPicture)
                 .districtChildId(this.districtChildId)
                 .password(this.password)
+                .userState(this.userState)
                 .build();
     }
 

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

+package com.mmc.iuav.user.entity;
+
+import java.io.Serializable;
+
+/**
+ * (UserState)实体类
+ *
+ * @author makejava
+ * @since 2024-03-20 10:09:59
+ */
+public class UserStateDO implements Serializable {
+    private static final long serialVersionUID = -32633125960150583L;
+
+    private Integer id;
+    /**
+     * 用户状态
+     */
+    private String state;
+    /**
+     * 状态图标
+     */
+    private String icon;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+}
+

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

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.service;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.entity.BackUserAccountDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.entity.UserStateDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.dto.UserBaseInfoDTO;
@@ -190,4 +191,6 @@ public interface UserAccountService {
      */
     String selectUnionIdByPhone(String phone);
 
+    ResultBody getStateList();
+
 }

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

@@ -597,7 +597,11 @@ public class UserAccountServiceImpl implements UserAccountService {
         return userServiceDao.selectUnionIdByPhone(phone);
     }
 
-
+    @Override
+    public ResultBody getStateList() {
+        List<UserStateDO> stateList = userServiceDao.getStateList();
+        return ResultBody.success(stateList);
+    }
 
 
 }

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

@@ -208,10 +208,12 @@
                up.total_points,
                ua.brief_introduction,
                ua.cover_picture,
-               ua.district_child_id
+               ua.district_child_id,
+               us.state as user_state
         FROM user_account ua
                  LEFT JOIN pilot_certification pc ON pc.user_account_id = ua.id
                  LEFT JOIN user_points up ON up.user_account_id = ua.id
+        left join user_state us on us.id = ua.user_state_id
         WHERE ua.id = #{id}
     </select>
 
@@ -771,5 +773,8 @@
         where phone_num = #{phoneNum}
           and disable = 0
     </select>
+    <select id="getStateList" resultType="com.mmc.iuav.user.entity.UserStateDO">
+        select id,state,icon from user_state
+    </select>
 
 </mapper>