diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/qianlan/TestNodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/qianlan/TestNodeController.java new file mode 100644 index 000000000..951f23cf3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/qianlan/TestNodeController.java @@ -0,0 +1,111 @@ +package com.ruoyi.web.controller.qianlan; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.validation.constraints.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +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.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.vo.TestNodeVo; +import com.ruoyi.system.domain.bo.TestNodeBo; +import com.ruoyi.system.service.ITestNodeService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +/** + * 节点维护Controller + * + * @author qianlan + * @date 2021-08-08 + */ +@Validated +@Api(value = "节点维护控制器", tags = {"节点维护管理"}) +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/system/node") +public class TestNodeController extends BaseController { + + private final ITestNodeService iTestNodeService; + + /** + * 查询节点维护列表 + */ + @ApiOperation("查询节点维护列表") + @PreAuthorize("@ss.hasPermi('system:node:list')") + @GetMapping("/list") + public AjaxResult> list(@Validated TestNodeBo bo) { + List list = iTestNodeService.queryList(bo); + return AjaxResult.success(list); + } + + /** + * 导出节点维护列表 + */ + @ApiOperation("导出节点维护列表") + @PreAuthorize("@ss.hasPermi('system:node:export')") + @Log(title = "节点维护", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(@Validated TestNodeBo bo) { + List list = iTestNodeService.queryList(bo); + ExcelUtil util = new ExcelUtil(TestNodeVo.class); + return util.exportExcel(list, "节点维护"); + } + + /** + * 获取节点维护详细信息 + */ + @ApiOperation("获取节点维护详细信息") + @PreAuthorize("@ss.hasPermi('system:node:query')") + @GetMapping("/{id}") + public AjaxResult getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return AjaxResult.success(iTestNodeService.queryById(id)); + } + + /** + * 新增节点维护 + */ + @ApiOperation("新增节点维护") + @PreAuthorize("@ss.hasPermi('system:node:add')") + @Log(title = "节点维护", businessType = BusinessType.INSERT) + @RepeatSubmit + @PostMapping() + public AjaxResult add(@Validated(AddGroup.class) @RequestBody TestNodeBo bo) { + return toAjax(iTestNodeService.insertByBo(bo) ? 1 : 0); + } + + /** + * 修改节点维护 + */ + @ApiOperation("修改节点维护") + @PreAuthorize("@ss.hasPermi('system:node:edit')") + @Log(title = "节点维护", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PutMapping() + public AjaxResult edit(@Validated(EditGroup.class) @RequestBody TestNodeBo bo) { + return toAjax(iTestNodeService.updateByBo(bo) ? 1 : 0); + } + + /** + * 删除节点维护 + */ + @ApiOperation("删除节点维护") + @PreAuthorize("@ss.hasPermi('system:node:remove')") + @Log(title = "节点维护" , businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iTestNodeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0); + } +} diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6491c8557..4161595bc 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -78,7 +78,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: + password: root # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TestNode.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TestNode.java new file mode 100644 index 000000000..1653e8264 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TestNode.java @@ -0,0 +1,47 @@ +package com.ruoyi.system.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +/** + * 节点维护对象 test_node + * + * @author qianlan + * @date 2021-08-08 + */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("test_node") +public class TestNode implements Serializable { + + private static final long serialVersionUID=1L; + + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 节点名 + */ + private String name; + + /** + * 分类 + */ + private String categary; + + /** + * 父id + */ + private Long pid; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/TestNodeBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/TestNodeBo.java new file mode 100644 index 000000000..d9247574a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/TestNodeBo.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import com.ruoyi.common.core.domain.TreeEntity; + +/** + * 节点维护业务对象 test_node + * + * @author qianlan + * @date 2021-08-08 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel("节点维护业务对象") +public class TestNodeBo extends TreeEntity { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 节点名 + */ + @ApiModelProperty("节点名") + private String name; + + /** + * 分类 + */ + @ApiModelProperty("分类") + private String categary; + + /** + * 父id + */ + @ApiModelProperty("父id") + private Long pid; + + + /** + * 分页大小 + */ + @ApiModelProperty("分页大小") + private Integer pageSize; + + /** + * 当前页数 + */ + @ApiModelProperty("当前页数") + private Integer pageNum; + + /** + * 排序列 + */ + @ApiModelProperty("排序列") + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + @ApiModelProperty(value = "排序的方向", example = "asc,desc") + private String isAsc; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TestNodeVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TestNodeVo.java new file mode 100644 index 000000000..6952e825a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TestNodeVo.java @@ -0,0 +1,51 @@ +package com.ruoyi.system.domain.vo; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.util.Date; + + + +/** + * 节点维护视图对象 test_node + * + * @author qianlan + * @date 2021-08-08 + */ +@Data +@ApiModel("节点维护视图对象") +public class TestNodeVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + /** + * 节点名 + */ + @Excel(name = "节点名") + @ApiModelProperty("节点名") + private String name; + + /** + * 分类 + */ + @Excel(name = "分类") + @ApiModelProperty("分类") + private String categary; + + /** + * 父id + */ + @Excel(name = "父id") + @ApiModelProperty("父id") + private Long pid; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestNodeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestNodeMapper.java new file mode 100644 index 000000000..601a88a4b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestNodeMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.TestNode; +import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; +import org.apache.ibatis.annotations.CacheNamespace; + +/** + * 节点维护Mapper接口 + * + * @author qianlan + * @date 2021-08-08 + */ +public interface TestNodeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestNodeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestNodeService.java new file mode 100644 index 000000000..1157b9b3d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestNodeService.java @@ -0,0 +1,51 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.TestNode; +import com.ruoyi.system.domain.vo.TestNodeVo; +import com.ruoyi.system.domain.bo.TestNodeBo; +import com.ruoyi.common.core.mybatisplus.core.IServicePlus; + +import java.util.Collection; +import java.util.List; + +/** + * 节点维护Service接口 + * + * @author qianlan + * @date 2021-08-08 + */ +public interface ITestNodeService extends IServicePlus { + /** + * 查询单个 + * @return + */ + TestNodeVo queryById(Long id); + + + /** + * 查询列表 + */ + List queryList(TestNodeBo bo); + + /** + * 根据新增业务对象插入节点维护 + * @param bo 节点维护新增业务对象 + * @return + */ + Boolean insertByBo(TestNodeBo bo); + + /** + * 根据编辑业务对象修改节点维护 + * @param bo 节点维护编辑业务对象 + * @return + */ + Boolean updateByBo(TestNodeBo bo); + + /** + * 校验并删除数据 + * @param ids 主键集合 + * @param isValid 是否校验,true-删除前校验,false-不校验 + * @return + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestNodeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestNodeServiceImpl.java new file mode 100644 index 000000000..61da9ca3f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestNodeServiceImpl.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.system.domain.bo.TestNodeBo; +import com.ruoyi.system.domain.vo.TestNodeVo; +import com.ruoyi.system.domain.TestNode; +import com.ruoyi.system.mapper.TestNodeMapper; +import com.ruoyi.system.service.ITestNodeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 节点维护Service业务层处理 + * + * @author qianlan + * @date 2021-08-08 + */ +@Service +public class TestNodeServiceImpl extends ServicePlusImpl implements ITestNodeService { + + @Override + public TestNodeVo queryById(Long id){ + return getVoById(id); + } + + + @Override + public List queryList(TestNodeBo bo) { + return listVo(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(TestNodeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StrUtil.isNotBlank(bo.getName()), TestNode::getName, bo.getName()); + lqw.eq(StrUtil.isNotBlank(bo.getCategary()), TestNode::getCategary, bo.getCategary()); + lqw.eq(bo.getPid() != null, TestNode::getPid, bo.getPid()); + return lqw; + } + + @Override + public Boolean insertByBo(TestNodeBo bo) { + TestNode add = BeanUtil.toBean(bo, TestNode.class); + validEntityBeforeSave(add); + return save(add); + } + + @Override + public Boolean updateByBo(TestNodeBo bo) { + TestNode update = BeanUtil.toBean(bo, TestNode.class); + validEntityBeforeSave(update); + return updateById(update); + } + + /** + * 保存前的数据校验 + * + * @param entity 实体类数据 + */ + private void validEntityBeforeSave(TestNode entity){ + //TODO 做一些数据校验,如唯一约束 + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return removeByIds(ids); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/TestNodeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TestNodeMapper.xml new file mode 100644 index 000000000..9138ef0b0 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/TestNodeMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/node.js b/ruoyi-ui/src/api/system/node.js new file mode 100644 index 000000000..30f22d1ff --- /dev/null +++ b/ruoyi-ui/src/api/system/node.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询节点维护列表 +export function listNode(query) { + return request({ + url: '/system/node/list', + method: 'get', + params: query + }) +} + +// 查询节点维护详细 +export function getNode(id) { + return request({ + url: '/system/node/' + id, + method: 'get' + }) +} + +// 新增节点维护 +export function addNode(data) { + return request({ + url: '/system/node', + method: 'post', + data: data + }) +} + +// 修改节点维护 +export function updateNode(data) { + return request({ + url: '/system/node', + method: 'put', + data: data + }) +} + +// 删除节点维护 +export function delNode(id) { + return request({ + url: '/system/node/' + id, + method: 'delete' + }) +} + +// 导出节点维护 +export function exportNode(query) { + return request({ + url: '/system/node/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/node/index.vue b/ruoyi-ui/src/views/system/node/index.vue new file mode 100644 index 000000000..4353de078 --- /dev/null +++ b/ruoyi-ui/src/views/system/node/index.vue @@ -0,0 +1,274 @@ + + +