|
@@ -3,11 +3,13 @@ package cn.iocoder.yudao.module.member.controller.app.user;
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
|
+import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiPageReqVO;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiPageReqVO;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiRespVO;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiRespVO;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiSaveReqVO;
|
|
import cn.iocoder.yudao.module.member.controller.admin.userinfoai.vo.UserInfoAiSaveReqVO;
|
|
import cn.iocoder.yudao.module.member.dal.dataobject.userinfoai.UserInfoAiDO;
|
|
import cn.iocoder.yudao.module.member.dal.dataobject.userinfoai.UserInfoAiDO;
|
|
import cn.iocoder.yudao.module.member.service.userinfoai.UserInfoAiService;
|
|
import cn.iocoder.yudao.module.member.service.userinfoai.UserInfoAiService;
|
|
|
|
+import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -16,6 +18,7 @@ import jakarta.validation.Valid;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
@@ -73,4 +76,30 @@ public class AppUserInfoAiController {
|
|
List<UserInfoAiDO> list = userInfoAiService.getUserInfoAiList(pageReqVO);
|
|
List<UserInfoAiDO> list = userInfoAiService.getUserInfoAiList(pageReqVO);
|
|
return success(BeanUtils.toBean(list, UserInfoAiRespVO.class));
|
|
return success(BeanUtils.toBean(list, UserInfoAiRespVO.class));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @GetMapping("/listInfo")
|
|
|
|
+ @Operation(summary = "获得默认用户信息列表")
|
|
|
|
+ public CommonResult<List<UserInfoAiRespVO>> getAddressInfoList(UserInfoAiPageReqVO pageReqVO) {
|
|
|
|
+ List<UserInfoAiRespVO> respVOList = new ArrayList<>();
|
|
|
|
+ List<DictDataRespDTO> dictDatas = DictFrameworkUtils.getDictDatas("information_type");
|
|
|
|
+ pageReqVO.setUserId(getLoginUserId());
|
|
|
|
+ pageReqVO.setInfoStatus("1");
|
|
|
|
+ List<UserInfoAiDO> list = userInfoAiService.getUserInfoAiList(pageReqVO);
|
|
|
|
+
|
|
|
|
+ // 合并两个列表
|
|
|
|
+ for (DictDataRespDTO dictData : dictDatas) {
|
|
|
|
+ for (UserInfoAiDO userInfoAiDO : list) {
|
|
|
|
+ UserInfoAiRespVO userInfoAiRespVO = new UserInfoAiRespVO();
|
|
|
|
+ if (dictData.getDictType().equals(userInfoAiDO.getInformationType())) {
|
|
|
|
+
|
|
|
|
+ BeanUtils.copyProperties(userInfoAiDO, userInfoAiRespVO);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ userInfoAiRespVO.setInformationTypeTranName(dictData.getLabel());
|
|
|
|
+ userInfoAiRespVO.setInformationType(dictData.getValue());
|
|
|
|
+ respVOList.add(userInfoAiRespVO);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return success(respVOList);
|
|
|
|
+ }
|
|
}
|
|
}
|