Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
shop-Mall
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
shop-Mall
Commits
763897b7
Commit
763897b7
authored
Mar 14, 2021
by
m1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资讯模块数据——数据展示功能修复
parent
f89029fd
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
51 additions
and
31 deletions
+51
-31
Constants.java
...on/src/main/java/cn/wisenergy/common/utils/Constants.java
+3
-0
ShopZxMapper.java
...apper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
+8
-0
UsersMapper.java
...mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
+1
-3
ShopZxMapper.xml
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
+13
-3
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+2
-2
UploadService.java
...src/main/java/cn/wisenergy/service/app/UploadService.java
+3
-5
UploadServiceImpl.java
...java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+4
-8
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+7
-4
LoginController.java
...n/wisenergy/web/admin/controller/app/LoginController.java
+3
-3
UploadController.java
.../wisenergy/web/admin/controller/app/UploadController.java
+7
-3
No files found.
wisenergy-common/src/main/java/cn/wisenergy/common/utils/Constants.java
View file @
763897b7
...
...
@@ -19,6 +19,9 @@ public class Constants {
public
final
static
Integer
SEX_MAN
=
1
;
//数据精度
public
final
static
Integer
DECIMAL_DIGITS
=
2
;
//头像地址
public
final
static
String
HEAD_POTRAIT
=
"http://8.131.244.76:81/upload/14c54de0d-ee41-4e90-8c3e-ae6b93a2ad91.png"
;
}
//访问来源
public
static
class
SourceType
{
...
...
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
View file @
763897b7
...
...
@@ -23,6 +23,14 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
*/
int
zxadd
(
@Param
(
"zxUrl"
)
String
zxUrl
,
@Param
(
"zxField"
)
String
zxField
,
@Param
(
"zxAddress"
)
String
zxAddress
,
@Param
(
"inviteCode"
)
String
inviteCode
,
@Param
(
"zxDate"
)
Long
zxDate
);
/**
* 用户头像上传
* @param zxUrl
* @param zxDate
* @return
*/
int
zxadd1
(
@Param
(
"zxUrl"
)
String
zxUrl
,
@Param
(
"zxDate"
)
Long
zxDate
);
/**
* 查询资讯数据
*/
...
...
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
View file @
763897b7
...
...
@@ -117,10 +117,8 @@ public interface UsersMapper extends BaseMapper<User> {
* @param inviteCode
* @param beInvitedCode
* @param userLevel
* @param createTime
* @param updateTime
*/
Integer
insertbyint
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"inviteCode"
)
String
inviteCode
,
@Param
(
"beInvitedCode"
)
String
beInvitedCode
,
@Param
(
"userLevel"
)
Integer
userLevel
);
Integer
insertbyint
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"inviteCode"
)
String
inviteCode
,
@Param
(
"beInvitedCode"
)
String
beInvitedCode
,
@Param
(
"userLevel"
)
Integer
userLevel
,
@Param
(
"headImage"
)
String
headImage
);
Integer
save
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"beInvitedCode"
)
String
beInvitedCode
);
...
...
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @
763897b7
...
...
@@ -42,6 +42,16 @@
)
</insert>
<!--用户头像插入-->
<insert
id=
"zxadd1"
parameterType=
"cn.wisenergy.model.app.shopZx"
>
insert into
<include
refid=
"table"
/>
zx_url,zx_date
value(
#{zxUrl},#{zxDate}
)
</insert>
<!--资讯内容倒叙查询-->
<select
id=
"selectPage"
parameterType=
"java.lang.Integer"
resultType=
"cn.wisenergy.model.app.zxUserDto"
>
select
...
...
@@ -54,8 +64,8 @@
b.invite_code as inviteCode,
a.user_id as userId,
a.head_image as headImage
from shop_zx b
inner
join user_info a ON a.invite_code=b.invite_code
WHERE zx_to_examine !=
0
from shop_zx b
left
join user_info a ON a.invite_code=b.invite_code
WHERE zx_to_examine !=
1
order by zxid desc limit #{pageNum},#{pageSize}
</select>
<!--资讯总记录数查询-->
...
...
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
763897b7
...
...
@@ -188,8 +188,8 @@
<!--用户注册-->
<insert
id=
"insertbyint"
>
insert into user_info(user_id,invite_code,be_invited_code,user_level) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel})
insert into user_info(user_id,invite_code,be_invited_code,user_level
,head_image
) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel}
,#{headImage}
)
</insert>
<insert
id=
"save"
>
insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
View file @
763897b7
...
...
@@ -22,13 +22,11 @@ public interface UploadService {
Map
<
String
,
Object
>
uploadVideo
(
MultipartFile
file
,
HttpServletRequest
request
,
String
zxField
,
String
zxAddress
,
String
inviteCode
)
throws
Exception
;
/**
* TODO 图片文件上传
* @param request
* @param zxField
* @param zxAddress
* TODO 用户头像上传
*
* @return
*/
Map
<
String
,
Object
>
uploadImage
(
MultipartFile
file
,
HttpServletRequest
request
,
String
zxField
,
String
zxAddress
,
String
inviteCode
)
throws
Exception
;
Map
<
String
,
Object
>
uploadImage
(
MultipartFile
file
)
throws
Exception
;
/**
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @
763897b7
...
...
@@ -103,13 +103,13 @@ public class UploadServiceImpl implements UploadService {
* 图片文件上传
*/
@Override
public
Map
<
String
,
Object
>
uploadImage
(
MultipartFile
file
,
HttpServletRequest
request
,
String
zxField
,
String
zxAddress
,
String
inviteCode
)
throws
Exception
{
public
Map
<
String
,
Object
>
uploadImage
(
MultipartFile
file
)
throws
Exception
{
Map
<
String
,
Object
>
resultMap
=
new
HashMap
<
String
,
Object
>();
/**
* 生成当前时间戳
*/
Long
zxDate
=
Long
.
valueOf
(
System
.
currentTimeMillis
()
);
Long
zxDate
=
System
.
currentTimeMillis
(
);
// request.getScheme() + "://" + request.getServerName()
// + ":" + request.getServerPort()+"/upload/";
...
...
@@ -119,6 +119,7 @@ public class UploadServiceImpl implements UploadService {
Long
time
=
System
.
currentTimeMillis
();
String
zxName
=
file
.
getOriginalFilename
();
//文件原始名称
assert
zxName
!=
null
;
String
suffixName
=
zxName
.
substring
(
zxName
.
lastIndexOf
(
"."
));
//从最后一个.开始截取。截取zxName的后缀名
String
newzxName
=
time
+
suffixName
;
//文件新名称
//设置文件存储路径,可以存放在你想要指定的路径里面
...
...
@@ -138,7 +139,7 @@ public class UploadServiceImpl implements UploadService {
resultMap
.
put
(
"zxUrl"
,
zxUrl
);
resultMap
.
put
(
"returnCode"
,
0
);
shopZxMapper
.
zxadd
(
zxUrl
,
zxField
,
zxAddress
,
inviteCode
,
zxDate
);
shopZxMapper
.
zxadd
1
(
zxUrl
,
zxDate
);
return
resultMap
;
}
...
...
@@ -273,7 +274,6 @@ public class UploadServiceImpl implements UploadService {
List
<
zxUserDto
>
shopZxList
=
shopZxMapper
.
selectPage
(
pageNum
,
pageSize
);
for
(
zxUserDto
shopZx
:
shopZxList
)
{
String
zxUrl
=
shopZx
.
getZxUrl
();
;
shopZx
.
setUserId
(
shopZx
.
getUserId
().
replaceAll
(
"(\\d{3})\\d{4}(\\d{4})"
,
"$1****$2"
));
String
[]
split
=
StringUtils
.
split
(
zxUrl
,
","
);
if
(
null
!=
split
){
...
...
@@ -309,10 +309,6 @@ public class UploadServiceImpl implements UploadService {
// usersMapper.
// 没有点过的话,就进行插入点赞记录表,更新点赞数
}
try
{
shopZx
shopZx
=
shopZxMapper
.
selectByzxid
(
zxid
);
int
a
=
shopZx
.
getZxLikes
();
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
763897b7
...
...
@@ -107,7 +107,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
@Override
@Transactional
public
Map
userByZx
(
String
userId
,
String
beInvitedCode
)
{
//查询数据库,看看是否存在该用户
User
byUserId
=
usersMapper
.
getByUserId
(
userId
);
...
...
@@ -132,19 +131,21 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
*/
if
(
""
.
equals
(
beInvitedCode
)
||
null
==
beInvitedCode
)
{
//插入用户手机号与推荐人邀请码user_id,invite_code,be_invited_code,user_level,create_time,update_time
String
inviteCode
=
"0"
;
beInvitedCode
=
"1"
;
int
userLevel
=
0
;
usersMapper
.
insertbyint
(
userId
,
inviteCode
,
beInvitedCode
,
userLevel
);
registUserMoudleInit
(
userId
);
}
else
if
(
"1"
.
equals
(
beInvitedCode
))
{
//用户的被邀请码,查询到推荐人用户,根据推荐人用户的邀请码查询/修改
User
user
=
usersMapper
.
getByBeInvitedCode
(
beInvitedCode
);
//
邀请人的被邀请码
//
邀请人的被邀请码
String
byqm
=
user
.
getBeInvitedCode
();
//
通过被邀请码,比对本人邀请码查询本人id
//
通过被邀请码,比对本人邀请码查询本人id
String
idb
=
String
.
valueOf
(
usersMapper
.
beInvitedCode1
(
beInvitedCode
));
//判断是否存在被邀请人的用户
...
...
@@ -177,11 +178,13 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
String
inviteCode
=
ShareCodeUtil
.
idToCode
(
yqm
);
Integer
userLevel
=
0
;
//根据用户手机号,更新用户信息
//
usersMapper.edit1(userLevel,inviteCode,userId);
//
usersMapper.edit1(userLevel,inviteCode,userId);
User
byUserId1
=
usersMapper
.
getByUserId
(
userId
);
byUserId1
.
setInviteCode
(
inviteCode
);
byUserId1
.
setUserLevel
(
0
);
usersMapper
.
updateById
(
byUserId1
);
String
BYQM
=
String
.
valueOf
(
usersMapper
.
BYQMById
(
userId
));
if
(
"1"
.
equals
(
BYQM
))
{
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @
763897b7
...
...
@@ -203,11 +203,11 @@ public class LoginController {
@ApiOperation
(
value
=
"退出登录"
,
produces
=
"application/json"
,
notes
=
"退出登录"
)
@ApiImplicitParam
(
paramType
=
"header"
,
name
=
"token"
,
value
=
"用户token"
,
required
=
true
,
dataType
=
"String"
)
@PostMapping
(
"/logout"
)
public
Result
logout
(
HttpServletRequest
request
)
{
public
Result
logout
(
String
token
)
{
log
.
info
(
"退出登录"
);
Result
result
=
ResultUtils
.
returnFail
();
String
token
=
request
.
getHeader
(
"token"
);
String
key
=
RedisKeyUtils
.
formatKeyWithPrefix
(
Constants
.
Redis
.
PREFIX_TOKEN
,
token
);
// String token = request.getHeader("token");HttpServletRequest request
String
key
=
RedisKeyUtils
.
formatKeyWithPrefix
(
token
);
if
(
redisUtils
.
getValue
(
key
)
==
null
)
{
log
.
info
(
"要退出登录的用户未登录"
);
return
ResultUtils
.
returnResult
(
ResultEnum
.
FILE_NOT_LOGIN
);
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
View file @
763897b7
...
...
@@ -29,6 +29,9 @@ public class UploadController {
@Autowired
private
UploadService
uploadService
;
@Autowired
private
UserController
userController
;
/**
* @param request
* @return
...
...
@@ -61,7 +64,7 @@ public class UploadController {
/**
* TODO 用户头像上传
*
* @param
request
* @param
* @return
* @throws Exception
*/
...
...
@@ -70,8 +73,9 @@ public class UploadController {
@ApiImplicitParam
(
name
=
"file"
,
value
=
"单图片"
,
dataType
=
"MultipartFile"
),
@ApiImplicitParam
(
name
=
"inviteCode"
,
value
=
"用户本人邀请码(发布人)"
,
required
=
true
,
dataType
=
"String"
)})
@RequestMapping
(
value
=
"/uploadImage"
,
method
=
RequestMethod
.
POST
)
public
Map
<
String
,
Object
>
uploadImage
(
@RequestParam
(
value
=
"files"
)
MultipartFile
file
,
HttpServletRequest
request
,
String
zxField
,
String
zxAddress
,
String
inviteCode
)
throws
Exception
{
return
uploadService
.
uploadImage
(
file
,
request
,
zxField
,
zxAddress
,
inviteCode
);
public
Map
<
String
,
Object
>
uploadImage
(
@RequestParam
(
value
=
"files"
)
MultipartFile
file
)
throws
Exception
{
return
uploadService
.
uploadImage
(
file
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment