Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
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
external
on-site-service
Commits
75e2f65f
Commit
75e2f65f
authored
Jul 22, 2022
by
shangtx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 推广统计
parent
78506cf2
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
144 additions
and
23 deletions
+144
-23
ServicePromoteController.java
...ce/admin/controller/service/ServicePromoteController.java
+45
-0
PromotePageDTO.java
...eservice/admin/controller/service/dto/PromotePageDTO.java
+11
-0
ServicePromoteBizMapper.java
...service/admin/mapper/service/ServicePromoteBizMapper.java
+19
-0
ServicePromoteService.java
...eservice/admin/service/service/ServicePromoteService.java
+36
-0
UserService.java
...ava/com/onsiteservice/admin/service/user/UserService.java
+16
-0
application.yaml
admin/src/main/resources/application.yaml
+1
-1
ServicePromoteBizMapper.xml
...main/resources/mapper/service/ServicePromoteBizMapper.xml
+16
-0
OrderListenerTest.java
...a/com/onsiteservice/admin/listener/OrderListenerTest.java
+0
-22
UserServiceTest.java
...m/onsiteservice/miniapp/service/user/UserServiceTest.java
+0
-0
No files found.
admin/src/main/java/com/onsiteservice/admin/controller/service/ServicePromoteController.java
0 → 100644
View file @
75e2f65f
package
com
.
onsiteservice
.
admin
.
controller
.
service
;
import
com.onsiteservice.admin.controller.service.dto.PromotePageDTO
;
import
com.onsiteservice.entity.service.ServicePromote
;
import
com.onsiteservice.admin.service.service.ServicePromoteService
;
import
com.onsiteservice.core.result.Result
;
import
com.onsiteservice.dao.common.page.PageInfoVO
;
import
com.onsiteservice.dao.common.page.PageParams
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.NonNull
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
springfox.documentation.annotations.ApiIgnore
;
import
javax.annotation.Resource
;
import
javax.validation.constraints.Positive
;
import
static
com
.
onsiteservice
.
core
.
result
.
ResultGenerator
.
success
;
import
static
com
.
onsiteservice
.
core
.
result
.
ResultGenerator
.
fail
;
/**
* @author 商天翔
* @date 2022-07-21 15:55
* @description ServicePromoteController控制类
*/
@ApiIgnore
@Api
(
tags
=
"ServicePromoteController"
)
@RestController
@RequestMapping
(
"/service/promote"
)
@Validated
public
class
ServicePromoteController
{
@Resource
private
ServicePromoteService
servicePromoteService
;
@ApiOperation
(
value
=
"分页查询列表"
,
notes
=
"作者: 商天翔"
)
@PostMapping
(
"/page"
)
public
Result
<
PageInfoVO
>
getPage
(
@RequestBody
@NonNull
@Validated
PromotePageDTO
param
)
{
return
success
(
servicePromoteService
.
getPage
(
param
),
"获取分页列表"
);
}
}
admin/src/main/java/com/onsiteservice/admin/controller/service/dto/PromotePageDTO.java
0 → 100644
View file @
75e2f65f
package
com
.
onsiteservice
.
admin
.
controller
.
service
.
dto
;
import
com.onsiteservice.dao.common.page.PageParams
;
import
lombok.Data
;
@Data
public
class
PromotePageDTO
extends
PageParams
{
private
String
userName
;
}
admin/src/main/java/com/onsiteservice/admin/mapper/service/ServicePromoteBizMapper.java
0 → 100644
View file @
75e2f65f
package
com
.
onsiteservice
.
admin
.
mapper
.
service
;
import
com.onsiteservice.dao.common.page.PageParams
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* @author 商天翔
* @date 2022-07-21 15:55
* @description ServicePromoteBizMapper业务接口
*/
public
interface
ServicePromoteBizMapper
{
List
<
Map
>
getPage
(
@Param
(
"param"
)
PageParams
param
);
}
admin/src/main/java/com/onsiteservice/admin/service/service/ServicePromoteService.java
0 → 100644
View file @
75e2f65f
package
com
.
onsiteservice
.
admin
.
service
.
service
;
import
com.onsiteservice.entity.service.ServicePromote
;
import
com.onsiteservice.dao.mapper.service.ServicePromoteMapper
;
import
com.onsiteservice.admin.mapper.service.ServicePromoteBizMapper
;
import
com.onsiteservice.dao.common.AbstractMapper
;
import
com.onsiteservice.dao.common.page.PageParams
;
import
com.onsiteservice.dao.common.page.PageInfoVO
;
import
com.github.pagehelper.PageHelper
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
/**
* @author 商天翔
* @date 2022-07-21 15:55
* @description ServicePromoteService服务类
*/
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
ServicePromoteService
extends
AbstractMapper
<
ServicePromote
>
{
@Resource
private
ServicePromoteBizMapper
servicePromoteBizMapper
;
/**
* 分页查询列表
*/
public
PageInfoVO
getPage
(
PageParams
param
)
{
PageHelper
.
startPage
(
param
.
getPage
(),
param
.
getSize
());
return
new
PageInfoVO
(
servicePromoteBizMapper
.
getPage
(
param
));
}
}
admin/src/main/java/com/onsiteservice/admin/service/user/UserService.java
View file @
75e2f65f
package
com
.
onsiteservice
.
admin
.
service
.
user
;
package
com
.
onsiteservice
.
admin
.
service
.
user
;
import
com.onsiteservice.admin.controller.user.dto.UserPageDTO
;
import
com.onsiteservice.admin.controller.user.dto.UserPageDTO
;
import
com.onsiteservice.constant.enums.ServiceUserTypeEnum
;
import
com.onsiteservice.dao.mapper.service.ServicePromoteMapper
;
import
com.onsiteservice.dao.util.EntityUtils
;
import
com.onsiteservice.dao.util.EntityUtils
;
import
com.onsiteservice.entity.service.ServicePromote
;
import
com.onsiteservice.entity.user.User
;
import
com.onsiteservice.entity.user.User
;
import
com.onsiteservice.dao.mapper.user.UserMapper
;
import
com.onsiteservice.dao.mapper.user.UserMapper
;
import
com.onsiteservice.admin.mapper.user.UserBizMapper
;
import
com.onsiteservice.admin.mapper.user.UserBizMapper
;
...
@@ -28,6 +31,8 @@ public class UserService extends AbstractMapper<User> {
...
@@ -28,6 +31,8 @@ public class UserService extends AbstractMapper<User> {
private
UserMapper
userMapper
;
private
UserMapper
userMapper
;
@Resource
@Resource
private
UserBizMapper
userBizMapper
;
private
UserBizMapper
userBizMapper
;
@Resource
private
ServicePromoteMapper
servicePromoteMapper
;
/**
/**
* 分页查询列表
* 分页查询列表
...
@@ -42,6 +47,17 @@ public class UserService extends AbstractMapper<User> {
...
@@ -42,6 +47,17 @@ public class UserService extends AbstractMapper<User> {
*/
*/
public
int
update
(
User
user
,
Long
userId
)
{
public
int
update
(
User
user
,
Long
userId
)
{
EntityUtils
.
update
(
user
,
userId
);
EntityUtils
.
update
(
user
,
userId
);
if
(
ServiceUserTypeEnum
.
SALES
.
getId
().
equals
(
user
.
getRoleType
()))
{
ServicePromote
condition
=
new
ServicePromote
();
condition
.
setAccountNo
(
user
.
getId
());
var
promote
=
servicePromoteMapper
.
selectOne
(
condition
);
if
(
promote
==
null
)
{
promote
=
condition
;
promote
.
setCount
(
0
);
EntityUtils
.
insert
(
promote
,
userId
);
servicePromoteMapper
.
insertSelective
(
promote
);
}
}
return
this
.
updateByPrimaryKeySelective
(
user
);
return
this
.
updateByPrimaryKeySelective
(
user
);
}
}
}
}
admin/src/main/resources/application.yaml
View file @
75e2f65f
...
@@ -16,7 +16,7 @@ project:
...
@@ -16,7 +16,7 @@ project:
expires-time
:
8640000
# 1天有效期 秒
expires-time
:
8640000
# 1天有效期 秒
# 无需授权url资源
# 无需授权url资源
ant-paths
:
"
/error,/websocket/**,/api,/token/base,/monitor/**,/dict,/login,/doc.html,/webjars/**,/swagger**,
ant-paths
:
"
/error,/websocket/**,/api,/token/base,/monitor/**,/dict,/login,/doc.html,/webjars/**,/swagger**,
/swagger-resources/configuration/ui,/**/v2/api-docs"
/swagger-resources/configuration/ui,/**/v2/api-docs
,/websocket-test
"
admin-security
:
admin-security
:
enabled
:
true
enabled
:
true
custom-security
:
false
# url级别验证开关
custom-security
:
false
# url级别验证开关
...
...
admin/src/main/resources/mapper/service/ServicePromoteBizMapper.xml
0 → 100644
View file @
75e2f65f
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.onsiteservice.admin.mapper.service.ServicePromoteBizMapper"
>
<select
id=
"getPage"
resultType=
"java.util.Map"
>
select t.*
from service_promote t
<where>
<if
test=
"param.userName != null"
>
and t.user_name like "%"#{param.userName}"%"
</if>
</where>
order by t.id desc
</select>
</mapper>
admin/src/test/java/com/onsiteservice/admin/listener/OrderListenerTest.java
deleted
100644 → 0
View file @
78506cf2
package
com
.
onsiteservice
.
admin
.
listener
;
import
com.onsiteservice.constant.constant.SysConstants
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.amqp.core.AmqpTemplate
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
javax.annotation.Resource
;
@SpringBootTest
class
OrderListenerTest
{
@Resource
private
AmqpTemplate
amqpTemplate
;
@Test
public
void
notice
()
{
amqpTemplate
.
convertAndSend
(
SysConstants
.
Queue
.
ADMIN_ORDER
,
1
);
}
}
\ No newline at end of file
mini-app/src/test/java/com/onsiteservice/miniapp/service/user/UserServiceTest.java
deleted
100644 → 0
View file @
78506cf2
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