oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:zhijiantianya/onemall

Browse Source
This commit is contained in:
zhenxianyimeng
2019-06-26 23:55:00 +08:00
parent 07d1e31782 9e5e460b28
commit 89d875d0a9
12 changed files with 346 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AccessLogConvert.java
View File

@@ -1,10 +1,15 @@
package cn.iocoder.mall.admin.convert;
import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.admin.api.bo.systemlog.AccessLogBO;
import cn.iocoder.mall.admin.api.bo.systemlog.AccessLogPageBO;
import cn.iocoder.mall.admin.api.dto.systemlog.AccessLogAddDTO;
import cn.iocoder.mall.admin.api.dto.systemlog.ExceptionLogAddDTO;
import cn.iocoder.mall.admin.dataobject.AccessLogDO;
import cn.iocoder.mall.admin.dataobject.ExceptionLogDO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
@@ -19,4 +24,9 @@ public interface AccessLogConvert {
@Mappings({})
ExceptionLogDO convert(ExceptionLogAddDTO exceptionLogAddDTO);
@Mappings({
@Mapping(source = "records", target = "list"),
})
PageResult<AccessLogBO> convert(IPage<AccessLogDO> page);
}

11
system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AccessLogMapper.java
View File

@@ -1,10 +1,21 @@
package cn.iocoder.mall.admin.dao;
import cn.iocoder.common.framework.mybatis.QueryWrapperX;
import cn.iocoder.mall.admin.api.dto.admin.AdminPageDTO;
import cn.iocoder.mall.admin.api.dto.systemlog.AccessLogPageDTO;
import cn.iocoder.mall.admin.dataobject.AccessLogDO;
import cn.iocoder.mall.admin.dataobject.AdminDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Repository;
@Repository
public interface AccessLogMapper extends BaseMapper<AccessLogDO> {
default IPage<AccessLogDO> selectPage(AccessLogPageDTO accessLogPageDTO) {
return selectPage(new Page<>(accessLogPageDTO.getPageNo(), accessLogPageDTO.getPageSize()),
new QueryWrapperX<AccessLogDO>().eqIfPresent("user_id", accessLogPageDTO.getUserId()));
}
}

15
system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SystemLogServiceImpl.java
View File

@@ -1,8 +1,12 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.util.StringUtil;
import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.admin.api.SystemLogService;
import cn.iocoder.mall.admin.api.bo.systemlog.AccessLogBO;
import cn.iocoder.mall.admin.api.bo.systemlog.AccessLogPageBO;
import cn.iocoder.mall.admin.api.dto.systemlog.AccessLogAddDTO;
import cn.iocoder.mall.admin.api.dto.systemlog.AccessLogPageDTO;
import cn.iocoder.mall.admin.api.dto.systemlog.ExceptionLogAddDTO;
import cn.iocoder.mall.admin.convert.AccessLogConvert;
import cn.iocoder.mall.admin.dao.AccessLogMapper;
@@ -76,4 +80,15 @@ public class SystemLogServiceImpl implements SystemLogService {
exceptionLogMapper.insert(exceptionLog);
}
@Override
@SuppressWarnings("Duplicates")
public AccessLogPageBO getAccessLogPage(AccessLogPageDTO accessLogPageDTO) {
AccessLogPageBO accessLogPageBO = new AccessLogPageBO();
PageResult<AccessLogBO> accessLogPageBOPageResult = AccessLogConvert.INSTANCE.convert(
accessLogMapper.selectPage(accessLogPageDTO));
accessLogPageBO.setList(accessLogPageBOPageResult.getList());
accessLogPageBO.setTotal(accessLogPageBOPageResult.getTotal());
return accessLogPageBO;
}
}

35
system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SystemLogServiceImplTest.java Normal file
View File

@@ -0,0 +1,35 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.mall.admin.api.SystemLogService;
import cn.iocoder.mall.admin.api.bo.systemlog.AccessLogPageBO;
import cn.iocoder.mall.admin.api.dto.systemlog.AccessLogPageDTO;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* @author:ycjx
* @descriptio
* @create:2019-06-23 18:08
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = SystemLogServiceImplTest.class)
public class SystemLogServiceImplTest {
@Autowired
private SystemLogService systemLogService;
@Test
public void getAccessLogPageTest(){
AccessLogPageDTO accessLogPageDTO = new AccessLogPageDTO();
accessLogPageDTO.setPageNo(1);
accessLogPageDTO.setPageSize(10);
AccessLogPageBO accessLogPage = systemLogService.getAccessLogPage(accessLogPageDTO);
System.out.println(accessLogPage.getTotal());
}
}