wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove 删除无用测试类

This commit is contained in:
疯狂的狮子li 2021-06-23 09:51:44 +08:00
parent c12dc71ece
commit f48e807cee
11 changed files with 0 additions and 620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/ChkjTestAddBo.java
View File

@ -1,50 +0,0 @@
package com.ruoyi.demo.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 测试添加对象 chkj_test
*
* @author Lion Li
* @date 2021-05-14
*/
@Data
@ApiModel("测试添加对象")
public class ChkjTestAddBo {
/** key键 */
@ApiModelProperty("key键")
@NotBlank(message = "key键不能为空")
private String testKey;
/** 值 */
@ApiModelProperty("值")
@NotBlank(message = "值不能为空")
private String value;
/** 版本 */
@ApiModelProperty("版本")
private Long version;
/** 创建时间 */
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 删除标志 */
@ApiModelProperty("删除标志")
private Long deleted;
/** 父id */
@ApiModelProperty("父id")
@NotNull(message = "父id不能为空")
private Long parentId;
/** 排序号 */
@ApiModelProperty("排序号")
@NotNull(message = "排序号不能为空")
private Long orderNum;
}

61
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/ChkjTestEditBo.java
View File

@ -1,61 +0,0 @@
package com.ruoyi.demo.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 测试编辑对象 chkj_test
*
* @author Lion Li
* @date 2021-05-14
*/
@Data
@ApiModel("测试编辑对象")
public class ChkjTestEditBo {
/** 主键 */
@ApiModelProperty("主键")
@NotNull(message = "主键不能为空")
private Long id;
/** key键 */
@ApiModelProperty("key键")
@NotBlank(message = "key键不能为空")
private String testKey;
/** 值 */
@ApiModelProperty("值")
@NotBlank(message = "值不能为空")
private String value;
/** 版本 */
@ApiModelProperty("版本")
private Long version;
/** 创建时间 */
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 删除标志 */
@ApiModelProperty("删除标志")
private Long deleted;
/** 父id */
@ApiModelProperty("父id")
@NotNull(message = "父id不能为空")
private Long parentId;
/** 排序号 */
@ApiModelProperty("排序号")
@NotNull(message = "排序号不能为空")
private Long orderNum;
}

53
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/ChkjTestQueryBo.java
View File

@ -1,53 +0,0 @@
package com.ruoyi.demo.bo;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 测试分页查询对象 chkj_test
*
* @author Lion Li
* @date 2021-05-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("测试分页查询对象")
public class ChkjTestQueryBo extends BaseEntity {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
/** 排序列 */
@ApiModelProperty("排序列")
private String orderByColumn;
/** 排序的方向desc或者asc */
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/** key键 */
@ApiModelProperty("key键")
private String testKey;
/** 值 */
@ApiModelProperty("值")
private String value;
/** 版本 */
@ApiModelProperty("版本")
private Long version;
/** 删除标志 */
@ApiModelProperty("删除标志")
private Long deleted;
/** 父id */
@ApiModelProperty("父id")
private Long parentId;
/** 排序号 */
@ApiModelProperty("排序号")
private Long orderNum;
}

108
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/ChkjTestController.java
View File

@ -1,108 +0,0 @@
package com.ruoyi.demo.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.demo.bo.ChkjTestAddBo;
import com.ruoyi.demo.bo.ChkjTestEditBo;
import com.ruoyi.demo.bo.ChkjTestQueryBo;
import com.ruoyi.demo.service.IChkjTestService;
import com.ruoyi.demo.vo.ChkjTestVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/**
* 测试Controller
*
* @author Lion Li
* @date 2021-05-14
*/
@Api(value = "测试控制器", tags = {"测试管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/demo/test")
public class ChkjTestController extends BaseController {
private final IChkjTestService iChkjTestService;
/**
* 查询测试列表
*/
@ApiOperation("查询测试列表")
@PreAuthorize("@ss.hasPermi('demo:test:list')")
@GetMapping("/list")
public TableDataInfo<ChkjTestVo> list(@Validated ChkjTestQueryBo bo) {
return iChkjTestService.queryPageList(bo);
}
/**
* 导出测试列表
*/
@ApiOperation("导出测试列表")
@PreAuthorize("@ss.hasPermi('demo:test:export')")
@Log(title = "测试", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult<ChkjTestVo> export(@Validated ChkjTestQueryBo bo) {
List<ChkjTestVo> list = iChkjTestService.queryList(bo);
ExcelUtil<ChkjTestVo> util = new ExcelUtil<ChkjTestVo>(ChkjTestVo.class);
return util.exportExcel(list, "测试");
}
/**
* 获取测试详细信息
*/
@ApiOperation("获取测试详细信息")
@PreAuthorize("@ss.hasPermi('demo:test:query')")
@GetMapping("/{id}")
public AjaxResult<ChkjTestVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iChkjTestService.queryById(id));
}
/**
* 新增测试
*/
@ApiOperation("新增测试")
@PreAuthorize("@ss.hasPermi('demo:test:add')")
@Log(title = "测试", businessType = BusinessType.INSERT)
@PostMapping()
public AjaxResult<Void> add(@Validated @RequestBody ChkjTestAddBo bo) {
return toAjax(iChkjTestService.insertByAddBo(bo) ? 1 : 0);
}
/**
* 修改测试
*/
@ApiOperation("修改测试")
@PreAuthorize("@ss.hasPermi('demo:test:edit')")
@Log(title = "测试", businessType = BusinessType.UPDATE)
@PutMapping()
public AjaxResult<Void> edit(@Validated @RequestBody ChkjTestEditBo bo) {
return toAjax(iChkjTestService.updateByEditBo(bo) ? 1 : 0);
}
/**
* 删除测试
*/
@ApiOperation("删除测试")
@PreAuthorize("@ss.hasPermi('demo:test:remove')")
@Log(title = "测试" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iChkjTestService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}

55
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/ChkjTest.java
View File

@ -1,55 +0,0 @@
package com.ruoyi.demo.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 测试对象 chkj_test
*
* @author Lion Li
* @date 2021-05-14
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("chkj_test")
public class ChkjTest implements Serializable {
private static final long serialVersionUID=1L;
/** 主键 */
@TableId(value = "id")
private Long id;
/** key键 */
private String testKey;
/** 值 */
private String value;
/** 版本 */
private Long version;
/** 创建时间 */
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 删除标志 */
private Long deleted;
/** 父id */
private Long parentId;
/** 排序号 */
private Long orderNum;
}

14
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/ChkjTestMapper.java
View File

@ -1,14 +0,0 @@
package com.ruoyi.demo.mapper;
import com.ruoyi.demo.domain.ChkjTest;
import com.ruoyi.common.core.page.BaseMapperPlus;
/**
* 测试Mapper接口
*
* @author Lion Li
* @date 2021-05-14
*/
public interface ChkjTestMapper extends BaseMapperPlus<ChkjTest> {
}

57
ruoyi-demo/src/main/java/com/ruoyi/demo/service/IChkjTestService.java
View File

@ -1,57 +0,0 @@
package com.ruoyi.demo.service;
import com.ruoyi.demo.domain.ChkjTest;
import com.ruoyi.demo.vo.ChkjTestVo;
import com.ruoyi.demo.bo.ChkjTestQueryBo;
import com.ruoyi.demo.bo.ChkjTestAddBo;
import com.ruoyi.demo.bo.ChkjTestEditBo;
import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.Collection;
import java.util.List;
/**
* 测试Service接口
*
* @author Lion Li
* @date 2021-05-14
*/
public interface IChkjTestService extends IServicePlus<ChkjTest> {
/**
* 查询单个
* @return
*/
ChkjTestVo queryById(Long id);
/**
* 查询列表
*/
TableDataInfo<ChkjTestVo> queryPageList(ChkjTestQueryBo bo);
/**
* 查询列表
*/
List<ChkjTestVo> queryList(ChkjTestQueryBo bo);
/**
* 根据新增业务对象插入测试
* @param bo 测试新增业务对象
* @return
*/
Boolean insertByAddBo(ChkjTestAddBo bo);
/**
* 根据编辑业务对象修改测试
* @param bo 测试编辑业务对象
* @return
*/
Boolean updateByEditBo(ChkjTestEditBo bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

93
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChkjTestServiceImpl.java
View File

@ -1,93 +0,0 @@
package com.ruoyi.demo.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.demo.bo.ChkjTestAddBo;
import com.ruoyi.demo.bo.ChkjTestEditBo;
import com.ruoyi.demo.bo.ChkjTestQueryBo;
import com.ruoyi.demo.domain.ChkjTest;
import com.ruoyi.demo.mapper.ChkjTestMapper;
import com.ruoyi.demo.service.IChkjTestService;
import com.ruoyi.demo.vo.ChkjTestVo;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 测试Service业务层处理
*
* @author Lion Li
* @date 2021-05-14
*/
@Service
public class ChkjTestServiceImpl extends ServiceImpl<ChkjTestMapper, ChkjTest> implements IChkjTestService {
@Override
public ChkjTestVo queryById(Long id){
return getVoById(id, obj -> BeanUtil.toBean(obj, ChkjTestVo.class));
}
@Override
public TableDataInfo<ChkjTestVo> queryPageList(ChkjTestQueryBo bo) {
PagePlus<ChkjTest, ChkjTestVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), ChkjTestVo.class);
return PageUtils.buildDataInfo(result);
}
@Override
public List<ChkjTestVo> queryList(ChkjTestQueryBo bo) {
return listVo(buildQueryWrapper(bo), ChkjTestVo.class);
}
private LambdaQueryWrapper<ChkjTest> buildQueryWrapper(ChkjTestQueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ChkjTest> lqw = Wrappers.lambdaQuery();
lqw.like(StrUtil.isNotBlank(bo.getTestKey()), ChkjTest::getTestKey, bo.getTestKey());
lqw.eq(StrUtil.isNotBlank(bo.getValue()), ChkjTest::getValue, bo.getValue());
lqw.eq(bo.getVersion() != null, ChkjTest::getVersion, bo.getVersion());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
ChkjTest::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"));
lqw.eq(bo.getDeleted() != null, ChkjTest::getDeleted, bo.getDeleted());
lqw.eq(bo.getParentId() != null, ChkjTest::getParentId, bo.getParentId());
lqw.eq(bo.getOrderNum() != null, ChkjTest::getOrderNum, bo.getOrderNum());
return lqw;
}
@Override
public Boolean insertByAddBo(ChkjTestAddBo bo) {
ChkjTest add = BeanUtil.toBean(bo, ChkjTest.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean updateByEditBo(ChkjTestEditBo bo) {
ChkjTest update = BeanUtil.toBean(bo, ChkjTest.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(ChkjTest entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return removeByIds(ids);
}
}

57
ruoyi-demo/src/main/java/com/ruoyi/demo/vo/ChkjTestVo.java
View File

@ -1,57 +0,0 @@
package com.ruoyi.demo.vo;
import com.ruoyi.common.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 测试视图对象 mall_package
*
* @author Lion Li
* @date 2021-05-14
*/
@Data
@ApiModel("测试视图对象")
public class ChkjTestVo {
private static final long serialVersionUID = 1L;
/** 主键 */
@ApiModelProperty("主键")
private Long id;
/** key键 */
@Excel(name = "key键")
@ApiModelProperty("key键")
private String testKey;
/** 值 */
@Excel(name = "值")
@ApiModelProperty("值")
private String value;
/** 版本 */
@Excel(name = "版本")
@ApiModelProperty("版本")
private Long version;
/** 创建时间 */
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private Date createTime;
/** 删除标志 */
@Excel(name = "删除标志")
@ApiModelProperty("删除标志")
private Long deleted;
/** 父id */
@Excel(name = "父id")
@ApiModelProperty("父id")
private Long parentId;
/** 排序号 */
@Excel(name = "排序号")
@ApiModelProperty("排序号")
private Long orderNum;
}

19
ruoyi-demo/src/main/resources/mapper/demo/ChkjTestMapper.xml
View File

@ -1,19 +0,0 @@
<?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.ruoyi.demo.mapper.ChkjTestMapper">
<resultMap type="com.ruoyi.demo.domain.ChkjTest" id="ChkjTestResult">
<result property="id" column="id"/>
<result property="testKey" column="test_key"/>
<result property="value" column="value"/>
<result property="version" column="version"/>
<result property="createTime" column="create_time"/>
<result property="deleted" column="deleted"/>
<result property="parentId" column="parent_id"/>
<result property="orderNum" column="order_num"/>
</resultMap>
</mapper>

53
ruoyi-ui/src/api/demo/test.js
View File

@ -1,53 +0,0 @@
import request from '@/utils/request'
// 查询测试列表
export function listTest(query) {
return request({
url: '/demo/test/list',
method: 'get',
params: query
})
}
// 查询测试详细
export function getTest(id) {
return request({
url: '/demo/test/' + id,
method: 'get'
})
}
// 新增测试
export function addTest(data) {
return request({
url: '/demo/test',
method: 'post',
data: data
})
}
// 修改测试
export function updateTest(data) {
return request({
url: '/demo/test',
method: 'put',
data: data
})
}
// 删除测试
export function delTest(id) {
return request({
url: '/demo/test/' + id,
method: 'delete'
})
}
// 导出测试
export function exportTest(query) {
return request({
url: '/demo/test/export',
method: 'get',
params: query
})
}