diff --git a/pom.xml b/pom.xml index f1362f2e3..c633bb9b5 100644 --- a/pom.xml +++ b/pom.xml @@ -357,6 +357,12 @@ ${revision} + + org.dromara + ruoyi-lx + ${revision} + + org.dromara diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 9e9780464..d40a74878 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -87,6 +87,12 @@ ruoyi-demo + + + org.dromara + ruoyi-lx + + org.dromara diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java index 2951f88d3..8040296d4 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -104,4 +104,17 @@ public class TestTreeController extends BaseController { @PathVariable Long[] ids) { return toAjax(testTreeService.deleteWithValidByIds(Arrays.asList(ids), true)); } + + /** + * 删除测试树表 + * + * @param ids 测试树ID串 + */ + @SaCheckPermission("demo:tree:remove") + @Log(title = "测试树表", businessType = BusinessType.DELETE) + @DeleteMapping("/test") + public R test(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(true); + } } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/TestTreeAController.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/OperateTreeController.java similarity index 61% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/TestTreeAController.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/OperateTreeController.java index 538b2d1f0..1b1c6ee6a 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/TestTreeAController.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/controller/OperateTreeController.java @@ -10,9 +10,9 @@ import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.lx.domain.bo.TestTreeBo; -import org.dromara.lx.domain.vo.TestTreeVo; -import org.dromara.lx.service.ITestTreeService; +import org.dromara.lx.domain.bo.LxTreeBo; +import org.dromara.lx.domain.vo.LxTreeVo; +import org.dromara.lx.service.ILxTreeTableService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,30 +32,30 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/demo/tree1") -public class TestTreeAController extends BaseController { +@RequestMapping("/operate/tree") +public class OperateTreeController extends BaseController { - private final ITestTreeService testTreeService; + private final ILxTreeTableService lxTreeTableService; /** * 查询测试树表列表 */ - @SaCheckPermission("demo:tree:list") + @SaCheckPermission("operate:tree:list") @GetMapping("/list") - public R> list(@Validated(QueryGroup.class) TestTreeBo bo) { - List list = testTreeService.queryList(bo); + public R> list(@Validated(QueryGroup.class) LxTreeBo ao) { + List list = lxTreeTableService.queryList(ao); return R.ok(list); } /** * 导出测试树表列表 */ - @SaCheckPermission("demo:tree:export") + @SaCheckPermission("operate:tree:export") @Log(title = "测试树表", businessType = BusinessType.EXPORT) @GetMapping("/export") - public void export(@Validated TestTreeBo bo, HttpServletResponse response) { - List list = testTreeService.queryList(bo); - ExcelUtil.exportExcel(list, "测试树表", TestTreeVo.class, response); + public void export(@Validated LxTreeBo ao, HttpServletResponse response) { + List list = lxTreeTableService.queryList(ao); + ExcelUtil.exportExcel(list, "测试树表", LxTreeVo.class, response); } /** @@ -63,33 +63,33 @@ public class TestTreeAController extends BaseController { * * @param id 测试树ID */ - @SaCheckPermission("demo:tree:query") + @SaCheckPermission("operate:tree:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { - return R.ok(testTreeService.queryById(id)); + return R.ok(lxTreeTableService.queryById(id)); } /** * 新增测试树表 */ - @SaCheckPermission("demo:tree:add") + @SaCheckPermission("operate:tree:add") @Log(title = "测试树表", businessType = BusinessType.INSERT) @RepeatSubmit @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { - return toAjax(testTreeService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody LxTreeBo ao) { + return toAjax(lxTreeTableService.insertByAo(ao)); } /** * 修改测试树表 */ - @SaCheckPermission("demo:tree:edit") + @SaCheckPermission("operate:tree:edit") @Log(title = "测试树表", businessType = BusinessType.UPDATE) @RepeatSubmit @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { - return toAjax(testTreeService.updateByBo(bo)); + public R edit(@Validated(EditGroup.class) @RequestBody LxTreeBo ao) { + return toAjax(lxTreeTableService.updateByAo(ao)); } /** @@ -97,11 +97,11 @@ public class TestTreeAController extends BaseController { * * @param ids 测试树ID串 */ - @SaCheckPermission("demo:tree:remove") + @SaCheckPermission("operate:tree:remove") @Log(title = "测试树表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(testTreeService.deleteWithValidByIds(Arrays.asList(ids), true)); + return toAjax(lxTreeTableService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestTree.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/LxTreeTable.java similarity index 84% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestTree.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/LxTreeTable.java index 379d63aa1..96a31536d 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestTree.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/LxTreeTable.java @@ -18,8 +18,8 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("test_tree") -public class TestTree extends TenantEntity { +@TableName("lx_tree_table") +public class LxTreeTable extends TenantEntity { @Serial private static final long serialVersionUID = 1L; @@ -35,21 +35,16 @@ public class TestTree extends TenantEntity { */ private Long parentId; - /** - * 部门id - */ - private Long deptId; - - /** - * 用户id - */ - private Long userId; - /** * 树节点名 */ private String treeName; + /** + * 树类型 + */ + private Integer treeType; + /** * 版本 */ diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemo.java deleted file mode 100644 index df34782c3..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemo.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.lx.domain; - -import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 测试单表对象 test_demo - * - * @author Lion Li - * @date 2021-07-26 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("test_demo") -public class TestDemo extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @TableId(value = "id") - private Long id; - - /** - * 部门id - */ - private Long deptId; - - /** - * 用户id - */ - private Long userId; - - /** - * 排序号 - */ - @OrderBy(asc = false, sort = 1) - private Integer orderNum; - - /** - * key键 - */ - private String testKey; - - /** - * 值 - */ - private String value; - - /** - * 版本 - */ - @Version - private Long version; - - /** - * 删除标志 - */ - @TableLogic - private Long delFlag; - -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemoEncrypt.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemoEncrypt.java deleted file mode 100644 index 53f2ee032..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/TestDemoEncrypt.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.dromara.lx.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("test_demo") -public class TestDemoEncrypt extends TestDemo { - - /** - * key键 - */ - // @EncryptField(algorithm=AlgorithmType.SM2, privateKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgZSlOvw8FBiH+aFJWLYZP/VRjg9wjfRarTkGBZd/T3N+gCgYIKoEcz1UBgi2hRANCAAR5DGuQwJqkxnbCsP+iPSDoHWIF4RwcR5EsSvT8QPxO1wRkR2IhCkzvRb32x2CUgJFdvoqVqfApFDPZzShqzBwX", publicKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEeQxrkMCapMZ2wrD/oj0g6B1iBeEcHEeRLEr0/ED8TtcEZEdiIQpM70W99sdglICRXb6KlanwKRQz2c0oaswcFw==") - @EncryptField(algorithm = AlgorithmType.RSA, privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANBBEeueWlXlkkj2+WY5l+IWe42d8b5K28g+G/CFKC/yYAEHtqGlCsBOrb+YBkG9mPzmuYA/n9k0NFIc8E8yY5vZQaroyFBrTTWEzG9RY2f7Y3svVyybs6jpXSUs4xff8abo7wL1Y/wUaeatTViamxYnyTvdTmLm3d+JjRij68rxAgMBAAECgYAB0TnhXraSopwIVRfmboea1b0upl+BUdTJcmci412UjrKr5aE695ZLPkXbFXijVu7HJlyyv94NVUdaMACV7Ku/S2RuNB70M7YJm8rAjHFC3/i2ZeIM60h1Ziy4QKv0XM3pRATlDCDNhC1WUrtQCQSgU8kcp6eUUppruOqDzcY04QJBAPm9+sBP9CwDRgy3e5+V8aZtJkwDstb0lVVV/KY890cydVxiCwvX3fqVnxKMlb+x0YtH0sb9v+71xvK2lGobaRECQQDVePU6r/cCEfpc+nkWF6osAH1f8Mux3rYv2DoBGvaPzV2BGfsLed4neRfCwWNCKvGPCdW+L0xMJg8+RwaoBUPhAkAT5kViqXxFPYWJYd1h2+rDXhMdH3ZSlm6HvDBDdrwlWinr0Iwcx3iSjPV93uHXwm118aUj4fg3LDJMCKxOwBxhAkByrQXfvwOMYygBprRBf/j0plazoWFrbd6lGR0f1uI5IfNnFRPdeFw1DEINZ2Hw+6zEUF44SqRMC+4IYJNc02dBAkBCgy7RvfyV/A7N6kKXxTHauY0v6XwSSvpeKtRJkbIcRWOdIYvaHO9L7cklj3vIEdwjSUp9K4VTBYYlmAz1xh03", publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDQQRHrnlpV5ZJI9vlmOZfiFnuNnfG+StvIPhvwhSgv8mABB7ahpQrATq2/mAZBvZj85rmAP5/ZNDRSHPBPMmOb2UGq6MhQa001hMxvUWNn+2N7L1csm7Oo6V0lLOMX3/Gm6O8C9WP8FGnmrU1YmpsWJ8k73U5i5t3fiY0Yo+vK8QIDAQAB") - private String testKey; - - /** - * 值 - */ - // @EncryptField // 什么也不写走默认yml配置 - // @EncryptField(algorithm = AlgorithmType.SM4, password = "10rfylhtccpuyke5") - @EncryptField(algorithm = AlgorithmType.AES, password = "10rfylhtccpuyke5") - private String value; - -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestTreeBo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/LxTreeBo.java similarity index 58% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestTreeBo.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/LxTreeBo.java index e674eeb60..9f62584c0 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestTreeBo.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/LxTreeBo.java @@ -1,14 +1,14 @@ package org.dromara.lx.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.lx.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.lx.domain.LxTreeTable; /** * 测试树表业务对象 test_tree @@ -19,8 +19,9 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TestTree.class, reverseConvertGenerate = false) -public class TestTreeBo extends BaseEntity { +@AutoMapper(target = LxTreeTable.class, reverseConvertGenerate = false) +public class LxTreeBo extends BaseEntity { + /** * 主键 @@ -33,17 +34,17 @@ public class TestTreeBo extends BaseEntity { */ private Long parentId; - /** - * 部门id - */ - @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long deptId; - - /** - * 用户id - */ - @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long userId; +// /** +// * 部门id +// */ +// @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class}) +// private Long deptId; +// +// /** +// * 用户id +// */ +// @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class}) +// private Long userId; /** * 树节点名 @@ -51,4 +52,10 @@ public class TestTreeBo extends BaseEntity { @NotBlank(message = "树节点名不能为空", groups = {AddGroup.class, EditGroup.class}) private String treeName; + /** + * 树节点类型 + */ + @NotBlank(message = "树节点类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String treeType; + } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoBo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoBo.java deleted file mode 100644 index edc9f11e0..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoBo.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.lx.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.lx.domain.TestDemo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -/** - * 测试单表业务对象 test_demo - * - * @author Lion Li - * @date 2021-07-26 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = TestDemo.class, reverseConvertGenerate = false) -public class TestDemoBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 部门id - */ - @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long deptId; - - /** - * 用户id - */ - @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long userId; - - /** - * 排序号 - */ - @NotNull(message = "排序号不能为空", groups = {AddGroup.class, EditGroup.class}) - private Integer orderNum; - - /** - * key键 - */ - @NotBlank(message = "key键不能为空", groups = {AddGroup.class, EditGroup.class}) - private String testKey; - - /** - * 值 - */ - @NotBlank(message = "值不能为空", groups = {AddGroup.class, EditGroup.class}) - private String value; - -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoImportVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoImportVo.java deleted file mode 100644 index a72fbf107..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/bo/TestDemoImportVo.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.dromara.lx.domain.bo; - -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - -/** - * 测试单表业务对象 test_demo - * - * @author Lion Li - * @date 2021-07-26 - */ -@Data -public class TestDemoImportVo { - - /** - * 部门id - */ - @NotNull(message = "部门id不能为空") - @ExcelProperty(value = "部门id") - private Long deptId; - - /** - * 用户id - */ - @NotNull(message = "用户id不能为空") - @ExcelProperty(value = "用户id") - private Long userId; - - /** - * 排序号 - */ - @NotNull(message = "排序号不能为空") - @ExcelProperty(value = "排序号") - private Long orderNum; - - /** - * key键 - */ - @NotBlank(message = "key键不能为空") - @ExcelProperty(value = "key键") - private String testKey; - - /** - * 值 - */ - @NotBlank(message = "值不能为空") - @ExcelProperty(value = "值") - private String value; - -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/ExportDemoVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/ExportDemoVo.java deleted file mode 100644 index 3e213403f..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/ExportDemoVo.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.dromara.lx.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.excel.convert.ExcelEnumConvert; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 带有下拉选的Excel导出 - * - * @author Emil.Zhang - */ -@Data -@ExcelIgnoreUnannotated -@AllArgsConstructor -@NoArgsConstructor -public class ExportDemoVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户昵称 - */ - @ExcelProperty(value = "用户名", index = 0) - @NotEmpty(message = "用户名不能为空", groups = AddGroup.class) - private String nickName; - - /** - * 用户类型 - *

- * 使用ExcelEnumFormat注解需要进行下拉选的部分 - */ - @ExcelProperty(value = "用户类型", index = 1, converter = ExcelEnumConvert.class) - @ExcelEnumFormat(enumClass = UserStatus.class, textField = "info") - @NotEmpty(message = "用户类型不能为空", groups = AddGroup.class) - private String userStatus; - - /** - * 性别 - *

- * 使用ExcelDictFormat注解需要进行下拉选的部分 - */ - @ExcelProperty(value = "性别", index = 2, converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_user_sex") - @NotEmpty(message = "性别不能为空", groups = AddGroup.class) - private String gender; - - /** - * 手机号 - */ - @ExcelProperty(value = "手机号", index = 3) - @NotEmpty(message = "手机号不能为空", groups = AddGroup.class) - private String phoneNumber; - - /** - * Email - */ - @ExcelProperty(value = "Email", index = 4) - @NotEmpty(message = "Email不能为空", groups = AddGroup.class) - private String email; - - /** - * 省 - *

- * 级联下拉，仅判断是否选了 - */ - @ExcelProperty(value = "省", index = 5) - @NotNull(message = "省不能为空", groups = AddGroup.class) - private String province; - - /** - * 数据库中的省ID - *

- * 处理完毕后再判断是否市正确的值 - */ - @NotNull(message = "请勿手动输入", groups = EditGroup.class) - private Integer provinceId; - - /** - * 市 - *

- * 级联下拉 - */ - @ExcelProperty(value = "市", index = 6) - @NotNull(message = "市不能为空", groups = AddGroup.class) - private String city; - - /** - * 数据库中的市ID - */ - @NotNull(message = "请勿手动输入", groups = EditGroup.class) - private Integer cityId; - - /** - * 县 - *

- * 级联下拉 - */ - @ExcelProperty(value = "县", index = 7) - @NotNull(message = "县不能为空", groups = AddGroup.class) - private String area; - - /** - * 数据库中的县ID - */ - @NotNull(message = "请勿手动输入", groups = EditGroup.class) - private Integer areaId; -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestTreeVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/LxTreeVo.java similarity index 69% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestTreeVo.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/LxTreeVo.java index 440713b79..eb9c6a867 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestTreeVo.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/LxTreeVo.java @@ -2,7 +2,7 @@ package org.dromara.lx.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.lx.domain.TestTree; +import org.dromara.lx.domain.LxTreeTable; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -19,8 +19,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = TestTree.class) -public class TestTreeVo implements Serializable { +@AutoMapper(target = LxTreeTable.class) +public class LxTreeVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -30,23 +30,28 @@ public class TestTreeVo implements Serializable { */ private Long id; + /** + * 主键 + */ + private Long treeType; + /** * 父id */ @ExcelProperty(value = "父id") private Long parentId; - /** - * 部门id - */ - @ExcelProperty(value = "部门id") - private Long deptId; +// /** +// * 部门id +// */ +// @ExcelProperty(value = "部门id") +// private Long deptId; - /** - * 用户id - */ - @ExcelProperty(value = "用户id") - private Long userId; +// /** +// * 用户id +// */ +// @ExcelProperty(value = "用户id") +// private Long userId; /** * 树节点名 diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestDemoVo.java deleted file mode 100644 index 81da2b613..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/domain/vo/TestDemoVo.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.dromara.lx.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelNotation; -import org.dromara.common.excel.annotation.ExcelRequired; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.lx.domain.TestDemo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 测试单表视图对象 test_demo - * - * @author Lion Li - * @date 2021-07-26 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = TestDemo.class) -public class TestDemoVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @ExcelProperty(value = "主键") - private Long id; - - /** - * 部门id - */ - @ExcelRequired - @ExcelProperty(value = "部门id") - private Long deptId; - - /** - * 用户id - */ - @ExcelRequired - @ExcelProperty(value = "用户id") - private Long userId; - - /** - * 排序号 - */ - @ExcelRequired - @ExcelProperty(value = "排序号") - private Integer orderNum; - - /** - * key键 - */ - @ExcelNotation(value = "测试key") - @ExcelProperty(value = "key键") - private String testKey; - - /** - * 值 - */ - @ExcelNotation(value = "测试value") - @ExcelProperty(value = "值") - private String value; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - - /** - * 创建人 - */ - @ExcelProperty(value = "创建人") - private Long createBy; - - /** - * 创建人账号 - */ - @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy") - @ExcelProperty(value = "创建人账号") - private String createByName; - - /** - * 更新时间 - */ - @ExcelProperty(value = "更新时间") - private Date updateTime; - - /** - * 更新人 - */ - @ExcelProperty(value = "更新人") - private Long updateBy; - - /** - * 更新人账号 - */ - @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "updateBy") - @ExcelProperty(value = "更新人账号") - private String updateByName; - -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/listener/ExportDemoListener.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/listener/ExportDemoListener.java deleted file mode 100644 index acdaf89e3..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/listener/ExportDemoListener.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.lx.listener; - -import cn.hutool.core.util.NumberUtil; -import com.alibaba.excel.context.AnalysisContext; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.lx.domain.vo.ExportDemoVo; - -import java.util.List; - -/** - * Excel带下拉框的解析处理器 - * - * @author Emil.Zhang - */ -public class ExportDemoListener extends DefaultExcelListener { - - public ExportDemoListener() { - // 显示使用构造函数，否则将导致空指针 - super(true); - } - - @Override - public void invoke(ExportDemoVo data, AnalysisContext context) { - // 先校验必填 - ValidatorUtils.validate(data, AddGroup.class); - - // 处理级联下拉的部分 - String province = data.getProvince(); - String city = data.getCity(); - String area = data.getArea(); - // 本行用户选择的省 - List thisRowSelectedProvinceOption = DropDownOptions.analyzeOptionValue(province); - if (thisRowSelectedProvinceOption.size() == 2) { - String provinceIdStr = thisRowSelectedProvinceOption.get(1); - if (NumberUtil.isNumber(provinceIdStr)) { - // 严格要求数据的话可以在这里做与数据库相关的判断 - // 例如判断省信息是否在数据库中存在等，建议结合RedisCache做缓存10s，减少数据库调用 - data.setProvinceId(Integer.parseInt(provinceIdStr)); - } - } - // 本行用户选择的市 - List thisRowSelectedCityOption = DropDownOptions.analyzeOptionValue(city); - if (thisRowSelectedCityOption.size() == 2) { - String cityIdStr = thisRowSelectedCityOption.get(1); - if (NumberUtil.isNumber(cityIdStr)) { - data.setCityId(Integer.parseInt(cityIdStr)); - } - } - // 本行用户选择的县 - List thisRowSelectedAreaOption = DropDownOptions.analyzeOptionValue(area); - if (thisRowSelectedAreaOption.size() == 2) { - String areaIdStr = thisRowSelectedAreaOption.get(1); - if (NumberUtil.isNumber(areaIdStr)) { - data.setAreaId(Integer.parseInt(areaIdStr)); - } - } - - // 处理完毕以后判断是否符合规则 - ValidatorUtils.validate(data, EditGroup.class); - - // 添加到处理结果中 - getExcelResult().getList().add(data); - } -} diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/TestTreeMapper.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/IxTreeTableMapper.java similarity index 71% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/TestTreeMapper.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/IxTreeTableMapper.java index b00d8c6db..0f02d18e2 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/TestTreeMapper.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/mapper/IxTreeTableMapper.java @@ -3,8 +3,8 @@ package org.dromara.lx.mapper; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.lx.domain.TestTree; -import org.dromara.lx.domain.vo.TestTreeVo; +import org.dromara.lx.domain.LxTreeTable; +import org.dromara.lx.domain.vo.LxTreeVo; /** * 测试树表Mapper接口 @@ -16,6 +16,6 @@ import org.dromara.lx.domain.vo.TestTreeVo; @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) -public interface TestTreeMapper extends BaseMapperPlus { +public interface IxTreeTableMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ITestTreeService.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ILxTreeTableService.java similarity index 73% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ITestTreeService.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ILxTreeTableService.java index 2c85fb4cc..3c63baa57 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ITestTreeService.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/ILxTreeTableService.java @@ -1,7 +1,7 @@ package org.dromara.lx.service; -import org.dromara.lx.domain.bo.TestTreeBo; -import org.dromara.lx.domain.vo.TestTreeVo; +import org.dromara.lx.domain.bo.LxTreeBo; +import org.dromara.lx.domain.vo.LxTreeVo; import java.util.Collection; import java.util.List; @@ -12,18 +12,18 @@ import java.util.List; * @author Lion Li * @date 2021-07-26 */ -public interface ITestTreeService { +public interface ILxTreeTableService { /** * 查询单个 * * @return */ - TestTreeVo queryById(Long id); + LxTreeVo queryById(Long id); /** * 查询列表 */ - List queryList(TestTreeBo bo); + List queryList(LxTreeBo bo); /** * 根据新增业务对象插入测试树表 @@ -31,7 +31,7 @@ public interface ITestTreeService { * @param bo 测试树表新增业务对象 * @return */ - Boolean insertByBo(TestTreeBo bo); + Boolean insertByAo(LxTreeBo bo); /** * 根据编辑业务对象修改测试树表 @@ -39,7 +39,7 @@ public interface ITestTreeService { * @param bo 测试树表编辑业务对象 * @return */ - Boolean updateByBo(TestTreeBo bo); + Boolean updateByAo(LxTreeBo bo); /** * 校验并删除数据 diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/LxTreeTableServiceImpl.java similarity index 56% rename from ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/TestTreeServiceImpl.java rename to ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/LxTreeTableServiceImpl.java index a61b034ee..a66548612 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/service/impl/LxTreeTableServiceImpl.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.lx.domain.TestTree; -import org.dromara.lx.domain.bo.TestTreeBo; -import org.dromara.lx.domain.vo.TestTreeVo; -import org.dromara.lx.mapper.TestTreeMapper; -import org.dromara.lx.service.ITestTreeService; +import org.dromara.lx.domain.LxTreeTable; +import org.dromara.lx.domain.bo.LxTreeBo; +import org.dromara.lx.domain.vo.LxTreeVo; +import org.dromara.lx.mapper.IxTreeTableMapper; +import org.dromara.lx.service.ILxTreeTableService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -25,35 +25,36 @@ import java.util.Map; // @DS("slave") // 切换从库查询 @RequiredArgsConstructor @Service -public class TestTreeServiceImpl implements ITestTreeService { +public class LxTreeTableServiceImpl implements ILxTreeTableService { - private final TestTreeMapper baseMapper; + private final IxTreeTableMapper baseMapper; @Override - public TestTreeVo queryById(Long id) { + public LxTreeVo queryById(Long id) { return baseMapper.selectVoById(id); } // @DS("slave") // 切换从库查询 @Override - public List queryList(TestTreeBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(LxTreeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(TestTreeBo bo) { + private LambdaQueryWrapper buildQueryWrapper(LxTreeBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getTreeName()), TestTree::getTreeName, bo.getTreeName()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTreeName()), LxTreeTable::getTreeName, bo.getTreeName()); + lqw.eq(StringUtils.isNotBlank(bo.getTreeType()), LxTreeTable::getTreeType, bo.getTreeType()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - TestTree::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); - lqw.orderByAsc(TestTree::getId); + LxTreeTable::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.orderByAsc(LxTreeTable::getId); return lqw; } @Override - public Boolean insertByBo(TestTreeBo bo) { - TestTree add = MapstructUtils.convert(bo, TestTree.class); + public Boolean insertByAo(LxTreeBo bo) { + LxTreeTable add = MapstructUtils.convert(bo, LxTreeTable.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -63,8 +64,8 @@ public class TestTreeServiceImpl implements ITestTreeService { } @Override - public Boolean updateByBo(TestTreeBo bo) { - TestTree update = MapstructUtils.convert(bo, TestTree.class); + public Boolean updateByAo(LxTreeBo bo) { + LxTreeTable update = MapstructUtils.convert(bo, LxTreeTable.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -74,7 +75,7 @@ public class TestTreeServiceImpl implements ITestTreeService { * * @param entity 实体类数据 */ - private void validEntityBeforeSave(TestTree entity) { + private void validEntityBeforeSave(LxTreeTable entity) { //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestDemoMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestDemoMapper.xml deleted file mode 100644 index 6e375d3a1..000000000 --- a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestDemoMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestTreeMapper.xml b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/lx/LxTreeMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestTreeMapper.xml rename to ruoyi-modules/ruoyi-lx/src/main/resources/mapper/lx/LxTreeMapper.xml index d7975ec52..27ae7195a 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/ruoyi-modules/ruoyi-lx/src/main/resources/mapper/lx/LxTreeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java index f9ca8ce80..4d6fc97fe 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestController.java @@ -34,7 +34,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/workflow/leave") +@RequestMapping("/workflow/leave1") public class TestController extends BaseController { private final ITestLeaveService testLeaveService;