Commit 67a055e9 authored by 黎博's avatar 黎博

获取模块列表新增项目名称字段

parent 7cbbdd2f
...@@ -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", autoModuleEntity.getTotal()); map.put("total", autoModuleIPage.getTotal());
map.put("list", autoModuleEntity.getRecords()); map.put("list", autoModuleIPage.getRecords());
return JsonResult.buildSuccessResult(map); return JsonResult.buildSuccessResult(map);
} }
......
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;
} }
...@@ -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);
} }
...@@ -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);
} }
...@@ -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);
}
} }
<?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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment