Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
holmes
Commits
67a055e9
Commit
67a055e9
authored
Apr 09, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
获取模块列表新增项目名称字段
parent
7cbbdd2f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
4 deletions
+34
-4
AutoModuleController.java
...va/cn/qg/holmes/controller/auto/AutoModuleController.java
+3
-4
AutoModule.java
src/main/java/cn/qg/holmes/entity/auto/AutoModule.java
+3
-0
AutoModuleMapper.java
src/main/java/cn/qg/holmes/mapper/auto/AutoModuleMapper.java
+2
-0
AutoModuleService.java
...ain/java/cn/qg/holmes/service/auto/AutoModuleService.java
+3
-0
AutoModuleServiceImpl.java
...cn/qg/holmes/service/auto/impl/AutoModuleServiceImpl.java
+12
-0
AutoModuleMapper.xml
src/main/resources/mapper/auto/AutoModuleMapper.xml
+11
-0
No files found.
src/main/java/cn/qg/holmes/controller/auto/AutoModuleController.java
View file @
67a055e9
...
@@ -36,11 +36,10 @@ public class AutoModuleController {
...
@@ -36,11 +36,10 @@ public class AutoModuleController {
*/
*/
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
JsonResult
getAutoModuleList
(
Integer
pageNum
,
Integer
pageSize
)
{
public
JsonResult
getAutoModuleList
(
Integer
pageNum
,
Integer
pageSize
)
{
IPage
<
AutoModule
>
autoModuleIPage
=
new
Page
<>(
pageNum
,
pageSize
);
IPage
<
AutoModule
>
autoModuleIPage
=
autoModuleService
.
getAutoModuleList
(
pageNum
,
pageSize
);
IPage
<
AutoModule
>
autoModuleEntity
=
autoModuleService
.
page
(
autoModuleIPage
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"total"
,
autoModule
Entity
.
getTotal
());
map
.
put
(
"total"
,
autoModule
IPage
.
getTotal
());
map
.
put
(
"list"
,
autoModule
Entity
.
getRecords
());
map
.
put
(
"list"
,
autoModule
IPage
.
getRecords
());
return
JsonResult
.
buildSuccessResult
(
map
);
return
JsonResult
.
buildSuccessResult
(
map
);
}
}
...
...
src/main/java/cn/qg/holmes/entity/auto/AutoModule.java
View file @
67a055e9
package
cn
.
qg
.
holmes
.
entity
.
auto
;
package
cn
.
qg
.
holmes
.
entity
.
auto
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
...
@@ -25,4 +26,6 @@ public class AutoModule {
...
@@ -25,4 +26,6 @@ public class AutoModule {
private
Date
createTime
;
private
Date
createTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
updateTime
;
private
Date
updateTime
;
@TableField
(
exist
=
false
)
private
String
projectName
;
}
}
src/main/java/cn/qg/holmes/mapper/auto/AutoModuleMapper.java
View file @
67a055e9
...
@@ -2,6 +2,8 @@ package cn.qg.holmes.mapper.auto;
...
@@ -2,6 +2,8 @@ package cn.qg.holmes.mapper.auto;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
public
interface
AutoModuleMapper
extends
BaseMapper
<
AutoModule
>
{
public
interface
AutoModuleMapper
extends
BaseMapper
<
AutoModule
>
{
IPage
<
AutoModule
>
getAutoModuleList
(
IPage
<
AutoModule
>
page
);
}
}
src/main/java/cn/qg/holmes/service/auto/AutoModuleService.java
View file @
67a055e9
...
@@ -2,7 +2,10 @@ package cn.qg.holmes.service.auto;
...
@@ -2,7 +2,10 @@ package cn.qg.holmes.service.auto;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
public
interface
AutoModuleService
extends
IService
<
AutoModule
>
{
public
interface
AutoModuleService
extends
IService
<
AutoModule
>
{
IPage
<
AutoModule
>
getAutoModuleList
(
Integer
pageNum
,
Integer
pageSize
);
}
}
src/main/java/cn/qg/holmes/service/auto/impl/AutoModuleServiceImpl.java
View file @
67a055e9
...
@@ -3,9 +3,21 @@ package cn.qg.holmes.service.auto.impl;
...
@@ -3,9 +3,21 @@ package cn.qg.holmes.service.auto.impl;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
cn.qg.holmes.entity.auto.AutoModule
;
import
cn.qg.holmes.mapper.auto.AutoModuleMapper
;
import
cn.qg.holmes.mapper.auto.AutoModuleMapper
;
import
cn.qg.holmes.service.auto.AutoModuleService
;
import
cn.qg.holmes.service.auto.AutoModuleService
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
@Service
@Service
public
class
AutoModuleServiceImpl
extends
ServiceImpl
<
AutoModuleMapper
,
AutoModule
>
implements
AutoModuleService
{
public
class
AutoModuleServiceImpl
extends
ServiceImpl
<
AutoModuleMapper
,
AutoModule
>
implements
AutoModuleService
{
@Autowired
AutoModuleMapper
autoModuleMapper
;
@Override
public
IPage
<
AutoModule
>
getAutoModuleList
(
Integer
pageNum
,
Integer
pageSize
)
{
IPage
<
AutoModule
>
page
=
new
Page
<>(
pageNum
,
pageSize
);
return
autoModuleMapper
.
getAutoModuleList
(
page
);
}
}
}
src/main/resources/mapper/auto/AutoModuleMapper.xml
0 → 100644
View file @
67a055e9
<?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=
"cn.qg.holmes.mapper.auto.AutoModuleMapper"
>
<select
id=
"getAutoModuleList"
resultType=
"cn.qg.holmes.entity.auto.AutoModule"
>
select a.*,
p.`name` as projectName
from `auto_module` a, project p
where a.`project_id` = p.`id`
</select>
</mapper>
\ No newline at end of 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