Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
cms
Commits
6e12b5f5
提交
6e12b5f5
authored
3月 29, 2024
作者:
刘明祎-运维用途
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
积分排行榜
上级
eed8c5a0
流水线
#8659
已通过 于阶段
in 2 分 29 秒
变更
7
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
137 行增加
和
52 行删除
+137
-52
PageQO.java
...odel/src/main/java/com/mmc/iuav/user/model/qo/PageQO.java
+28
-0
UserPointsSortVO.java
...ain/java/com/mmc/iuav/user/model/vo/UserPointsSortVO.java
+21
-0
UserAccountController.java
...a/com/mmc/iuav/user/controller/UserAccountController.java
+8
-0
UserPointsDao.java
.../java/com/mmc/iuav/user/dao/userpoints/UserPointsDao.java
+4
-0
UserAccountService.java
...in/java/com/mmc/iuav/user/service/UserAccountService.java
+3
-0
UserAccountServiceImpl.java
...om/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
+69
-52
UserPointsDao.xml
...er/src/main/resources/mapper/userpoints/UserPointsDao.xml
+4
-0
没有找到文件。
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/PageQO.java
0 → 100644
浏览文件 @
6e12b5f5
package
com
.
mmc
.
iuav
.
user
.
model
.
qo
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.springframework.data.domain.Page
;
import
javax.validation.constraints.Min
;
import
javax.validation.constraints.NotNull
;
@Data
@NoArgsConstructor
@AllArgsConstructor
public
class
PageQO
{
@ApiModelProperty
(
value
=
"页码"
,
required
=
true
,
example
=
"1"
)
@NotNull
(
message
=
"页码不能为空"
,
groups
=
Page
.
class
)
@Min
(
value
=
1
,
groups
=
Page
.
class
)
private
Integer
pageNo
;
@ApiModelProperty
(
value
=
"每页显示数"
,
required
=
true
,
example
=
"10"
)
@NotNull
(
message
=
"每页显示数不能为空"
,
groups
=
Page
.
class
)
@Min
(
value
=
1
,
groups
=
Page
.
class
)
private
Integer
pageSize
;
public
void
buildCurrentPage
()
{
this
.
pageNo
=
(
pageNo
-
1
)
*
pageSize
;
}
}
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserPointsSortVO.java
0 → 100644
浏览文件 @
6e12b5f5
package
com
.
mmc
.
iuav
.
user
.
model
.
vo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @author Admin
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
UserPointsSortVO
{
private
Integer
id
;
private
Integer
userAccountId
;
private
Integer
totalPoints
;
private
UserAccountVO
userAccountVO
;
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java
浏览文件 @
6e12b5f5
...
...
@@ -5,6 +5,7 @@ import com.mmc.iuav.group.Update;
import
com.mmc.iuav.response.ResultBody
;
import
com.mmc.iuav.user.model.dto.UserAccountSimpleDTO
;
import
com.mmc.iuav.user.model.dto.UserBaseInfoDTO
;
import
com.mmc.iuav.user.model.qo.PageQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserMessageQO
;
import
com.mmc.iuav.user.model.qo.UserRcdQO
;
...
...
@@ -150,6 +151,13 @@ public class UserAccountController extends BaseController {
return
userAccountService
.
topRcd
(
topNum
);
}
@ApiOperation
(
value
=
"积分排行榜"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@PostMapping
(
"topPoints"
)
public
ResultBody
topPoints
(
@RequestBody
PageQO
pageQO
)
{
return
userAccountService
.
topPoints
(
pageQO
);
}
@ApiOperation
(
value
=
"手机号查询用户信息"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"getUserAccountByPhoneNum"
)
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/userpoints/UserPointsDao.java
浏览文件 @
6e12b5f5
package
com
.
mmc
.
iuav
.
user
.
dao
.
userpoints
;
import
com.mmc.iuav.user.entity.userpoints.UserPointsDO
;
import
com.mmc.iuav.user.model.qo.PageQO
;
import
com.mmc.iuav.user.model.qo.userpoints.UserPointQO
;
import
com.mmc.iuav.user.model.vo.BuyPointsVO
;
import
com.mmc.iuav.user.model.vo.UserPointsSortVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -31,4 +33,6 @@ public interface UserPointsDao {
void
insertBuyPointsType
(
BuyPointsVO
buyPointsVO
);
void
updateBuyPointsType
(
BuyPointsVO
buyPointsVO
);
List
<
UserPointsSortVO
>
selectUserPointsSort
(
PageQO
pageQO
);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserAccountService.java
浏览文件 @
6e12b5f5
...
...
@@ -7,6 +7,7 @@ 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
;
import
com.mmc.iuav.user.model.qo.PageQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserMessageQO
;
import
com.mmc.iuav.user.model.qo.UserRcdQO
;
...
...
@@ -168,6 +169,8 @@ public interface UserAccountService {
*/
ResultBody
topRcd
(
Integer
topNum
);
ResultBody
topPoints
(
PageQO
pageQO
);
/**
* 通过手机号查询用户信息
*
...
...
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
浏览文件 @
6e12b5f5
...
...
@@ -18,6 +18,7 @@ import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
import
com.mmc.iuav.user.model.dto.RealNameAuthDTO
;
import
com.mmc.iuav.user.model.dto.UserAccountSimpleDTO
;
import
com.mmc.iuav.user.model.dto.UserBaseInfoDTO
;
import
com.mmc.iuav.user.model.qo.PageQO
;
import
com.mmc.iuav.user.model.qo.UserAccountQO
;
import
com.mmc.iuav.user.model.qo.UserMessageQO
;
import
com.mmc.iuav.user.model.qo.UserRcdQO
;
...
...
@@ -40,6 +41,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* @author: zj
...
...
@@ -118,60 +120,11 @@ public class UserAccountServiceImpl implements UserAccountService {
@Override
public
UserAccountVO
getUserAccountById
(
Integer
userAccountId
)
{
UserAccountDO
userAccountDO
=
userServiceDao
.
getUserAccountById
(
userAccountId
);
if
(
userAccountDO
==
null
)
{
return
null
;
}
String
districtChild
=
userServiceDao
.
getDistrictChild
(
userAccountDO
.
getDistrictChildId
());
userAccountDO
.
setRegion
(
districtChild
);
UserAccountVO
userAccountVO
=
userAccountDO
.
buildUserAccountVO
();
ResultBody
<
RealNameAuthDTO
>
nameAuthDTOResultBody
=
realNameAuthService
.
userDetail
(
userAccountId
);
RealNameAuthDTO
realNameAuthDTO
=
nameAuthDTOResultBody
.
getResult
();
if
(
realNameAuthDTO
!=
null
&&
realNameAuthDTO
.
getCheckStatus
().
equals
(
1
))
{
userAccountVO
.
setRealNameAuthStatus
(
1
);
userAccountVO
.
setUserName
(
realNameAuthDTO
.
getUserName
());
}
CompanyAuthVO
companyAuthVO
=
companyAuthService
.
getCompanyAuthByUId
(
userAccountId
);
if
(
companyAuthVO
!=
null
)
{
userAccountVO
.
setCompanyAuthStatus
(
companyAuthVO
.
getAuthStatus
());
}
else
{
userAccountVO
.
setCompanyAuthStatus
(
0
);
}
List
<
CooperationTagDO
>
cooperationTagDOS
=
cooperationDao
.
listUserCooperationTag
(
userAccountId
);
if
(!
CollectionUtils
.
isEmpty
(
cooperationTagDOS
))
{
List
<
CooperationTagVO
>
cooperationTags
=
cooperationTagDOS
.
stream
().
map
(
CooperationTagDO:
:
buildCooperationTagVO
).
collect
(
Collectors
.
toList
());
userAccountVO
.
setCooperationTagVOS
(
cooperationTags
);
}
XzAuthDO
xzAuthDO
=
xzDao
.
getXzAuthByUserAccountId
(
userAccountId
);
if
(
xzAuthDO
!=
null
)
{
userAccountVO
.
setXzAuthStatus
(
xzAuthDO
.
getXzAuthStatus
());
}
else
{
userAccountVO
.
setXzAuthStatus
(
0
);
}
UserSubInfoDO
userSubInfoDO
=
userSubInfoDao
.
getUserSubInfoByUnionId
(
userAccountDO
.
getUnionId
());
if
(
userSubInfoDO
!=
null
&&
userSubInfoDO
.
getRegStatus
().
equals
(
1
))
{
userAccountVO
.
setSubStatus
(
1
);
}
else
{
userAccountVO
.
setSubStatus
(
0
);
}
CompanyInfoDO
companyInfoDO
=
certificationDao
.
selectCompanyInfoByPilotId
(
userAccountId
,
1
);
if
(
companyInfoDO
!=
null
)
{
CompanyInfoVO
companyInfoVO
=
companyInfoDO
.
buildCompanyInfoVO
();
userAccountVO
.
setCompanyInfoVO
(
companyInfoVO
);
}
Integer
backUserId
=
certificationDao
.
selectBackUserIdByUserId
(
userAccountId
);
// log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
if
(
backUserId
!=
null
)
{
userAccountVO
.
setBackUserId
(
backUserId
);
}
Integer
userStateId
=
userAccountDO
.
getUserStateId
();
if
(
userStateId
!=
null
){
userAccountVO
.
setUserStateVO
(
userServiceDao
.
getUserState
(
userStateId
));
}
return
userAccountVO
;
return
getUserAccountVO
(
userAccountId
);
}
@Override
public
ResultBody
update
(
UserAccountVO
userAccountVO
)
{
UserAccountDO
userAccountDO
=
new
UserAccountDO
(
userAccountVO
);
...
...
@@ -522,6 +475,17 @@ public class UserAccountServiceImpl implements UserAccountService {
}
@Override
public
ResultBody
topPoints
(
PageQO
pageQO
)
{
pageQO
.
buildCurrentPage
();
List
<
UserPointsSortVO
>
userPointsSortVOS
=
userPointsDao
.
selectUserPointsSort
(
pageQO
);
List
<
UserPointsSortVO
>
collect
=
userPointsSortVOS
.
stream
().
peek
(
UserPointsSortVO
->
{
UserAccountVO
userAccountVO
=
getUserAccountVO
(
UserPointsSortVO
.
getUserAccountId
());
UserPointsSortVO
.
setUserAccountVO
(
userAccountVO
);
}).
collect
(
Collectors
.
toList
());
return
ResultBody
.
success
(
collect
);
}
@Override
public
ResultBody
getUserAccountByPhoneNum
(
String
phoneNum
)
{
List
<
UserAccountDO
>
userAccountDOS
=
userServiceDao
.
getUserAccountByPhoneNum
(
phoneNum
);
if
(!
CollectionUtils
.
isEmpty
(
userAccountDOS
))
{
...
...
@@ -606,6 +570,59 @@ public class UserAccountServiceImpl implements UserAccountService {
List
<
UserStateDO
>
stateList
=
userServiceDao
.
getStateList
();
return
ResultBody
.
success
(
stateList
);
}
private
UserAccountVO
getUserAccountVO
(
Integer
userAccountId
)
{
UserAccountDO
userAccountDO
=
userServiceDao
.
getUserAccountById
(
userAccountId
);
if
(
userAccountDO
==
null
)
{
return
null
;
}
String
districtChild
=
userServiceDao
.
getDistrictChild
(
userAccountDO
.
getDistrictChildId
());
userAccountDO
.
setRegion
(
districtChild
);
UserAccountVO
userAccountVO
=
userAccountDO
.
buildUserAccountVO
();
ResultBody
<
RealNameAuthDTO
>
nameAuthDTOResultBody
=
realNameAuthService
.
userDetail
(
userAccountId
);
RealNameAuthDTO
realNameAuthDTO
=
nameAuthDTOResultBody
.
getResult
();
if
(
realNameAuthDTO
!=
null
&&
realNameAuthDTO
.
getCheckStatus
().
equals
(
1
))
{
userAccountVO
.
setRealNameAuthStatus
(
1
);
userAccountVO
.
setUserName
(
realNameAuthDTO
.
getUserName
());
}
CompanyAuthVO
companyAuthVO
=
companyAuthService
.
getCompanyAuthByUId
(
userAccountId
);
if
(
companyAuthVO
!=
null
)
{
userAccountVO
.
setCompanyAuthStatus
(
companyAuthVO
.
getAuthStatus
());
}
else
{
userAccountVO
.
setCompanyAuthStatus
(
0
);
}
List
<
CooperationTagDO
>
cooperationTagDOS
=
cooperationDao
.
listUserCooperationTag
(
userAccountId
);
if
(!
CollectionUtils
.
isEmpty
(
cooperationTagDOS
))
{
List
<
CooperationTagVO
>
cooperationTags
=
cooperationTagDOS
.
stream
().
map
(
CooperationTagDO:
:
buildCooperationTagVO
).
collect
(
Collectors
.
toList
());
userAccountVO
.
setCooperationTagVOS
(
cooperationTags
);
}
XzAuthDO
xzAuthDO
=
xzDao
.
getXzAuthByUserAccountId
(
userAccountId
);
if
(
xzAuthDO
!=
null
)
{
userAccountVO
.
setXzAuthStatus
(
xzAuthDO
.
getXzAuthStatus
());
}
else
{
userAccountVO
.
setXzAuthStatus
(
0
);
}
UserSubInfoDO
userSubInfoDO
=
userSubInfoDao
.
getUserSubInfoByUnionId
(
userAccountDO
.
getUnionId
());
if
(
userSubInfoDO
!=
null
&&
userSubInfoDO
.
getRegStatus
().
equals
(
1
))
{
userAccountVO
.
setSubStatus
(
1
);
}
else
{
userAccountVO
.
setSubStatus
(
0
);
}
CompanyInfoDO
companyInfoDO
=
certificationDao
.
selectCompanyInfoByPilotId
(
userAccountId
,
1
);
if
(
companyInfoDO
!=
null
)
{
CompanyInfoVO
companyInfoVO
=
companyInfoDO
.
buildCompanyInfoVO
();
userAccountVO
.
setCompanyInfoVO
(
companyInfoVO
);
}
Integer
backUserId
=
certificationDao
.
selectBackUserIdByUserId
(
userAccountId
);
// log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
if
(
backUserId
!=
null
)
{
userAccountVO
.
setBackUserId
(
backUserId
);
}
Integer
userStateId
=
userAccountDO
.
getUserStateId
();
if
(
userStateId
!=
null
){
userAccountVO
.
setUserStateVO
(
userServiceDao
.
getUserState
(
userStateId
));
}
return
userAccountVO
;
}
}
csm-service/cms-service-user/src/main/resources/mapper/userpoints/UserPointsDao.xml
浏览文件 @
6e12b5f5
...
...
@@ -99,6 +99,10 @@
select *
from user_points_buy
</select>
<select
id=
"selectUserPointsSort"
resultType=
"com.mmc.iuav.user.model.vo.UserPointsSortVO"
>
select id,user_account_id,total_points from user_points
order by total_points desc limit #{pageNo},#{pageSize}
</select>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论