From f01e81a4a7073e9a958bb464f26e1c8dafa0ca3d Mon Sep 17 00:00:00 2001 From: zsvg <8680782@qq.com> Date: Fri, 17 Dec 2021 18:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=B8=8E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pom.xml | 1 + vboot-application/pom.xml | 15 ++++ .../src/main/java/com/abc/Application.java | 1 - .../java/com/abc}/it/db/cate/ItDbCate.java | 2 +- .../java/com/abc}/it/db/cate/ItDbCateApi.java | 2 +- .../com/abc}/it/db/cate/ItDbCateRepo.java | 2 +- .../com/abc}/it/db/cate/ItDbCateService.java | 2 +- .../java/com/abc}/it/db/main/ItDbMain.java | 2 +- .../java/com/abc}/it/db/main/ItDbMainApi.java | 2 +- .../com/abc}/it/db/main/ItDbMainRepo.java | 2 +- .../com/abc}/it/db/main/ItDbMainService.java | 2 +- .../com/abc}/it/server/cate/ItServerCate.java | 2 +- .../abc}/it/server/cate/ItServerCateApi.java | 2 +- .../abc}/it/server/cate/ItServerCateRepo.java | 2 +- .../it/server/cate/ItServerCateService.java | 2 +- .../com/abc}/it/server/main/ItServerMain.java | 2 +- .../abc}/it/server/main/ItServerMainApi.java | 2 +- .../abc}/it/server/main/ItServerMainRepo.java | 2 +- .../it/server/main/ItServerMainService.java | 2 +- .../src/main/resources/application.properties | 12 +++- .../lib/ojdbc6.jar | Bin vboot-core/pom.xml | 7 ++ .../zsvg/vboot/common/mvc/dao/JdbcDao.java | 4 +- .../com/zsvg/vboot/common/mvc/dao/Sqler.java | 6 +- .../com/zsvg/vboot/common/mvc/pojo/Zconn.java | 6 +- .../vboot/config/db/init/DbInitListener.java | 14 ++-- .../gen/org/rece/GenOrgReceService.java | 2 +- vboot-extend-bi/pom.xml | 7 -- .../java/com/zsvg/vboot/bi/BiTestApi.java | 19 ----- .../zsvg/vboot/bi/conn/main/BiConnMain.java | 21 ++++++ .../conn/main/BiConnMainApi.java} | 26 +++---- .../vboot/bi/conn/main/BiConnMainRepo.java | 8 +++ .../conn/main/BiConnMainService.java} | 9 ++- .../vboot/bi/demo/boy/BiDemoBoyService.java | 1 - .../zsvg/vboot/it/proj/cate/ItProjCate.java | 15 ---- .../vboot/it/proj/cate/ItProjCateRepo.java | 8 --- .../zsvg/vboot/it/proj/main/ItProjMain.java | 15 ---- .../vboot/it/proj/main/ItProjMainRepo.java | 8 --- .../vboot/it/task/cate/ItTaskCateRepo.java | 8 --- .../zsvg/vboot/it/task/main/ItTaskMain.java | 15 ---- .../vboot/it/task/main/ItTaskMainRepo.java | 8 --- vboot-extend-ps/pom.xml | 22 ++++++ .../zsvg/vboot/ps/proj/cate/PsProjCate.java | 25 +++++++ .../vboot/ps/proj/cate/PsProjCateApi.java | 55 +++++++++++++++ .../vboot/ps/proj/cate/PsProjCateRepo.java | 8 +++ .../vboot/ps/proj/cate/PsProjCateService.java | 66 ++++++++++++++++++ .../zsvg/vboot/ps/proj/main/PsProjMain.java | 23 ++++++ .../vboot/ps/proj/main/PsProjMainApi.java | 16 ++--- .../vboot/ps/proj/main/PsProjMainRepo.java | 8 +++ .../vboot/ps/proj/main/PsProjMainService.java | 6 +- .../zsvg/vboot/ps/task/cate/PsTaskCate.java | 4 +- .../vboot/ps/task/cate/PsTaskCateApi.java | 16 ++--- .../vboot/ps/task/cate/PsTaskCateRepo.java | 8 +++ .../vboot/ps/task/cate/PsTaskCateService.java | 6 +- .../zsvg/vboot/ps/task/list/PsTaskList.java | 24 +++++++ .../vboot/ps/task/list/PsTaskListApi.java | 45 ++++++++++++ .../vboot/ps/task/list/PsTaskListRepo.java | 8 +++ .../vboot/ps/task/list/PsTaskListService.java | 21 ++++++ .../zsvg/vboot/ps/task/main/PsTaskMain.java | 24 +++++++ .../vboot/ps/task/main/PsTaskMainApi.java | 16 ++--- .../vboot/ps/task/main/PsTaskMainRepo.java | 8 +++ .../vboot/ps/task/main/PsTaskMainService.java | 7 +- 63 files changed, 495 insertions(+), 191 deletions(-) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/cate/ItDbCate.java (85%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/cate/ItDbCateApi.java (97%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/cate/ItDbCateRepo.java (79%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/cate/ItDbCateService.java (92%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/main/ItDbMain.java (85%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/main/ItDbMainApi.java (97%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/main/ItDbMainRepo.java (79%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/db/main/ItDbMainService.java (92%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/cate/ItServerCate.java (84%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/cate/ItServerCateApi.java (96%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/cate/ItServerCateRepo.java (79%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/cate/ItServerCateService.java (92%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/main/ItServerMain.java (84%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/main/ItServerMainApi.java (96%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/main/ItServerMainRepo.java (79%) rename {vboot-extend-bi/src/main/java/com/zsvg/vboot => vboot-application/src/main/java/com/abc}/it/server/main/ItServerMainService.java (92%) rename {vboot-extend-bi => vboot-core}/lib/ojdbc6.jar (100%) delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/BiTestApi.java create mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMain.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/{it/proj/cate/ItProjCateApi.java => bi/conn/main/BiConnMainApi.java} (53%) create mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainRepo.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/{it/task/cate/ItTaskCateService.java => bi/conn/main/BiConnMainService.java} (60%) delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCate.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateRepo.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMain.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainRepo.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateRepo.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMain.java delete mode 100644 vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainRepo.java create mode 100644 vboot-extend-ps/pom.xml create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCate.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateApi.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateRepo.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateService.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMain.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainApi.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainApi.java (71%) create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainRepo.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainService.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainService.java (73%) rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCate.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCate.java (65%) rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateApi.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateApi.java (72%) create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateRepo.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateService.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateService.java (73%) create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskList.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListApi.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListRepo.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListService.java create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMain.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainApi.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainApi.java (71%) create mode 100644 vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainRepo.java rename vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainService.java => vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainService.java (73%) diff --git a/README.md b/README.md index 90e1fe3..0fd3115 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ### 🍟 概述 * 基于JAVA实现的快速开发平台。模块化插件式开发，前后端分离，开箱即用。 -* 后台基于SpringBoot框架，数据库访问使用Jpa，自动生成数据库表结构。 +* 后台基于SpringBoot框架，数据库访问同时集成了Jpa与MyBatis-Plus，即可自动生成数据库表结构，又可灵活编写sql。 * 前端基于Vben-Admin vxe-table框架。 * 核心模块包括：部门、用户、岗位、群组、角色、菜单、字典、日志、文件管理、定时任务等功能。 * .NET6实现的同功能项目地址[https://gitee.com/zsvg/vboot-net](https://gitee.com/zsvg/vboot-net) 两个项目会同步开发 diff --git a/pom.xml b/pom.xml index db5582b..04f5d19 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ vboot-application vboot-extend-bi vboot-extend-wf + vboot-extend-ps diff --git a/vboot-application/pom.xml b/vboot-application/pom.xml index a0c65d7..337e46c 100644 --- a/vboot-application/pom.xml +++ b/vboot-application/pom.xml @@ -17,6 +17,8 @@ vboot-extend-bi ${vboot.version} + + com.zsvg vboot-extend-wf @@ -29,6 +31,19 @@ + + + com.zsvg + vboot-extend-ps + ${vboot.version} + + + com.zsvg + vboot-core + + + + mysql mysql-connector-java diff --git a/vboot-application/src/main/java/com/abc/Application.java b/vboot-application/src/main/java/com/abc/Application.java index 11c1e6e..16e2fcd 100644 --- a/vboot-application/src/main/java/com/abc/Application.java +++ b/vboot-application/src/main/java/com/abc/Application.java @@ -23,7 +23,6 @@ import java.net.UnknownHostException; @EnableJpaRepositories({"com.zsvg","com.abc"}) @Slf4j @EnableAsync -//@MapperScan({"com.abc"})//mybatis-plus扫描mapper //@EnableSwagger2 public class Application { diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCate.java b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCate.java similarity index 85% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCate.java rename to vboot-application/src/main/java/com/abc/it/db/cate/ItDbCate.java index ceae5d5..9436945 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCate.java +++ b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCate.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.cate; +package com.abc.it.db.cate; import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; import lombok.Getter; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateApi.java b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateApi.java similarity index 97% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateApi.java rename to vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateApi.java index bcc8229..1b0a1e8 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateApi.java +++ b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.cate; +package com.abc.it.db.cate; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateRepo.java b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateRepo.java similarity index 79% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateRepo.java rename to vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateRepo.java index 7f916e5..cea6140 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateRepo.java +++ b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateRepo.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.cate; +package com.abc.it.db.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateService.java b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateService.java similarity index 92% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateService.java rename to vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateService.java index d407c98..9f37c6b 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/cate/ItDbCateService.java +++ b/vboot-application/src/main/java/com/abc/it/db/cate/ItDbCateService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.cate; +package com.abc.it.db.cate; import com.zsvg.vboot.common.mvc.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMain.java b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMain.java similarity index 85% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMain.java rename to vboot-application/src/main/java/com/abc/it/db/main/ItDbMain.java index 9737968..78fde24 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMain.java +++ b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMain.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.main; +package com.abc.it.db.main; import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainApi.java b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainApi.java similarity index 97% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainApi.java rename to vboot-application/src/main/java/com/abc/it/db/main/ItDbMainApi.java index 4423c52..ab2ae63 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainApi.java +++ b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.main; +package com.abc.it.db.main; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainRepo.java b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainRepo.java similarity index 79% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainRepo.java rename to vboot-application/src/main/java/com/abc/it/db/main/ItDbMainRepo.java index f8d972c..b833ffb 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainRepo.java +++ b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainRepo.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.main; +package com.abc.it.db.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainService.java b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainService.java similarity index 92% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainService.java rename to vboot-application/src/main/java/com/abc/it/db/main/ItDbMainService.java index ea9e59c..3e5ef2f 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/db/main/ItDbMainService.java +++ b/vboot-application/src/main/java/com/abc/it/db/main/ItDbMainService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.db.main; +package com.abc.it.db.main; import com.zsvg.vboot.common.mvc.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCate.java b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCate.java similarity index 84% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCate.java rename to vboot-application/src/main/java/com/abc/it/server/cate/ItServerCate.java index 5aee87d..2307c43 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCate.java +++ b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCate.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.cate; +package com.abc.it.server.cate; import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; import lombok.Getter; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateApi.java b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateApi.java similarity index 96% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateApi.java rename to vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateApi.java index 5e9b876..4dddf0c 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateApi.java +++ b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.cate; +package com.abc.it.server.cate; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateRepo.java b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateRepo.java similarity index 79% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateRepo.java rename to vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateRepo.java index 42d62b4..39f450d 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateRepo.java +++ b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateRepo.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.cate; +package com.abc.it.server.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateService.java b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateService.java similarity index 92% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateService.java rename to vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateService.java index 4273192..b57649b 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/cate/ItServerCateService.java +++ b/vboot-application/src/main/java/com/abc/it/server/cate/ItServerCateService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.cate; +package com.abc.it.server.cate; import com.zsvg.vboot.common.mvc.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMain.java b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMain.java similarity index 84% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMain.java rename to vboot-application/src/main/java/com/abc/it/server/main/ItServerMain.java index 306a026..a22892f 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMain.java +++ b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMain.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.main; +package com.abc.it.server.main; import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainApi.java b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainApi.java similarity index 96% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainApi.java rename to vboot-application/src/main/java/com/abc/it/server/main/ItServerMainApi.java index 0413fb8..c4d6616 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainApi.java +++ b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.main; +package com.abc.it.server.main; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainRepo.java b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainRepo.java similarity index 79% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainRepo.java rename to vboot-application/src/main/java/com/abc/it/server/main/ItServerMainRepo.java index 7a9601a..692f7ef 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainRepo.java +++ b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainRepo.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.main; +package com.abc.it.server.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainService.java b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainService.java similarity index 92% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainService.java rename to vboot-application/src/main/java/com/abc/it/server/main/ItServerMainService.java index cc8f255..8820dee 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/server/main/ItServerMainService.java +++ b/vboot-application/src/main/java/com/abc/it/server/main/ItServerMainService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.server.main; +package com.abc.it.server.main; import com.zsvg.vboot.common.mvc.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/resources/application.properties b/vboot-application/src/main/resources/application.properties index 4b0c22c..1d2df1f 100644 --- a/vboot-application/src/main/resources/application.properties +++ b/vboot-application/src/main/resources/application.properties @@ -8,19 +8,25 @@ server.compression.min-response-size=40960000 #mysql spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vboot-java?characterEncoding=utf-8&useSSL=false +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dw?characterEncoding=utf-8&useSSL=false #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vboot-java?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&nullCatalogMeansCurrent=true +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vboot-java?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&nullCatalogMeansCurrent=true spring.datasource.username=root spring.datasource.password=123456 + #oracle #spring.datasource.driver-class-name=oracle.jdbc.OracleDriver #spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl #spring.datasource.username=vboot #spring.datasource.password=123456 -app.db.type=MYSQL + +#应用初始化类型 +#-- sa:组织架构只包含一个sa管理员与一个vben的演示账户 +#--demo:除了以上数据还包含了一些demo部门与demo用户 +app.init.type=sa +app.db.type=mysql app.att.path=C:/vboot/att #1代表session,2待办jwt token app.authc.type=2 diff --git a/vboot-extend-bi/lib/ojdbc6.jar b/vboot-core/lib/ojdbc6.jar similarity index 100% rename from vboot-extend-bi/lib/ojdbc6.jar rename to vboot-core/lib/ojdbc6.jar diff --git a/vboot-core/pom.xml b/vboot-core/pom.xml index 4f3d797..0db990b 100644 --- a/vboot-core/pom.xml +++ b/vboot-core/pom.xml @@ -60,6 +60,13 @@ spring-boot-starter-data-redis + + com.oracle + ojdbc6 + 11.2.0 + system + ${pom.basedir}/lib/ojdbc6.jar + diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/JdbcDao.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/JdbcDao.java index c82ccaa..5695336 100644 --- a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/JdbcDao.java +++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/JdbcDao.java @@ -31,9 +31,9 @@ public class JdbcDao { return new PageData(0, new ArrayList<>()); } List> list; - if ("MYSQL".equals(DB_TYPE)) { + if ("mysql".equals(DB_TYPE)) { list = jdbcTemplate.queryForList(sqler.getMysqlPagingSql(), sqler.getParams()); - }else if ("ORACLE".equals(DB_TYPE)) { + }else if ("oracle".equals(DB_TYPE)) { list = jdbcTemplate.queryForList(sqler.getOraclePagingLowerCaseSql(), sqler.getParams()); } else { System.err.println("目前只支持mysql与oracle"); diff --git a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/Sqler.java b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/Sqler.java index 6ad2fc5..f077d79 100644 --- a/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/Sqler.java +++ b/vboot-core/src/main/java/com/zsvg/vboot/common/mvc/dao/Sqler.java @@ -168,7 +168,7 @@ public class Sqler public Sqler addGtDate(String name, Object value, String dbType) { - if("ORACLE".equals(dbType)){ + if("oracle".equals(dbType)){ if (XstringUtil.isNotBlank(value + "")) { if (whereClause.length() == 0) @@ -180,7 +180,7 @@ public class Sqler } parameters.add(value); } - }else if("MYSQL".equals(dbType)){ + }else if("mysql".equals(dbType)){ if (XstringUtil.isNotBlank(value + "")) { if (whereClause.length() == 0) @@ -199,7 +199,7 @@ public class Sqler public Sqler addLtDate(String name, Object value, String dbType) { - if("ORACLE".equals(dbType)) { + if("oracle".equals(dbType)) { if (XstringUtil.isNotBlank(value + "")) { if (whereClause.length() == 0) { whereClause = " WHERE " + name + " { + @Value("${app.init.type}") + private String INIT_TYPE; /** * 首次数据库生成后，初始化组织架构，菜单，权限角色等信息 * 增加sa，admin管理员账号及相关测试账号 @@ -25,15 +28,16 @@ public class DbInitListener implements ApplicationListener list; - if ("MYSQL".equals(jdbcDao.getDbType())) { + if ("mysql".equals(jdbcDao.getDbType())) { list = jdbcDao.getTp().query(sqler.getMysqlPagingSql(), sqler.getParams(), new BeanPropertyRowMapper<>(GenOrgRece.class)); } else { list = jdbcDao.getTp().query(sqler.getOraclePagingLowerCaseSql(), sqler.getParams(), new BeanPropertyRowMapper<>(GenOrgRece.class)); diff --git a/vboot-extend-bi/pom.xml b/vboot-extend-bi/pom.xml index 69d0e64..7040f8a 100644 --- a/vboot-extend-bi/pom.xml +++ b/vboot-extend-bi/pom.xml @@ -79,13 +79,6 @@ ${pom.basedir}/lib/jface-3.3.0-I20070606-0010.jar - - com.oracle - ojdbc6 - 11.2.0 - system - ${pom.basedir}/lib/ojdbc6.jar - org.javassist diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/BiTestApi.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/BiTestApi.java deleted file mode 100644 index 1fed07b..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/BiTestApi.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.zsvg.vboot.bi; - -import com.zsvg.vboot.common.mvc.api.RestResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("bi") -public class BiTestApi { - - @GetMapping("test") - public RestResult get() { - return RestResult.ok("这里可以放扩展模块1"); - } - -} - - diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMain.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMain.java new file mode 100644 index 0000000..a2f9451 --- /dev/null +++ b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMain.java @@ -0,0 +1,21 @@ +package com.zsvg.vboot.bi.conn.main; + +import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Column; +import javax.persistence.Entity; + +@Entity +@Getter +@Setter +public class BiConnMain extends BaseMainEntity { + + @Column(length = 64) + private String comet;//注释 + + @Column(length = 64) + private String notes;//备注 + +} \ No newline at end of file diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateApi.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainApi.java similarity index 53% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateApi.java rename to vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainApi.java index b95928b..2928654 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateApi.java +++ b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainApi.java @@ -1,38 +1,40 @@ -package com.zsvg.vboot.it.proj.cate; +package com.zsvg.vboot.bi.conn.main; +import com.zsvg.vboot.bi.table.main.BiTableMain; +import com.zsvg.vboot.bi.table.main.BiTableMainService; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("it/proj/cate") -public class ItProjCateApi { +@RequestMapping("bi/conn/main") +public class BiConnMainApi { - private String table = "it_proj_cate"; + private String table = "bi_conn_main"; @GetMapping public RestResult get(String name) { Sqler sqler = new Sqler(table); sqler.addLike("t.name", name); - sqler.addSelect("t.notes,t.ornum"); + sqler.addSelect("t.comet,t.notes"); return RestResult.ok(service.findPageData(sqler)); } @GetMapping("one/{id}") public RestResult getOne(@PathVariable String id) { - ItProjCate cate = service.findOne(id); - return RestResult.ok(cate); + BiTableMain main = service.findOne(id); + return RestResult.ok(main); } @PostMapping - public RestResult post(@RequestBody ItProjCate cate) { - return RestResult.ok(service.insert(cate)); + public RestResult post(@RequestBody BiTableMain main) { + return RestResult.ok(service.insert(main)); } @PutMapping - public RestResult put(@RequestBody ItProjCate cate) { - return RestResult.ok(service.update(cate)); + public RestResult put(@RequestBody BiTableMain main) { + return RestResult.ok(service.update(main)); } @DeleteMapping("{ids}") @@ -41,6 +43,6 @@ public class ItProjCateApi { } @Autowired - private ItProjCateService service; + private BiTableMainService service; } \ No newline at end of file diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainRepo.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainRepo.java new file mode 100644 index 0000000..eb61cfd --- /dev/null +++ b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.bi.conn.main; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BiConnMainRepo extends JpaRepository { + + +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateService.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainService.java similarity index 60% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateService.java rename to vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainService.java index 5113abb..e084adb 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateService.java +++ b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/conn/main/BiConnMainService.java @@ -1,18 +1,17 @@ -package com.zsvg.vboot.it.task.cate; +package com.zsvg.vboot.bi.conn.main; -import com.zsvg.vboot.common.mvc.service.BaseCateService; +import com.zsvg.vboot.common.mvc.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @Service -public class ItTaskCateService extends BaseCateService { - +public class BiConnMainService extends BaseMainService { //----------bean注入------------ @Autowired - private ItTaskCateRepo repo; + private BiConnMainRepo repo; @PostConstruct public void initDao() { diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/demo/boy/BiDemoBoyService.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/demo/boy/BiDemoBoyService.java index 3e469a8..4326a68 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/demo/boy/BiDemoBoyService.java +++ b/vboot-extend-bi/src/main/java/com/zsvg/vboot/bi/demo/boy/BiDemoBoyService.java @@ -1,7 +1,6 @@ package com.zsvg.vboot.bi.demo.boy; import com.zsvg.vboot.common.mvc.service.BaseService; -import com.zsvg.vboot.it.db.main.ItDbMainRepo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCate.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCate.java deleted file mode 100644 index ade5a0f..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zsvg.vboot.it.proj.cate; - -import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class ItProjCate extends BaseCateEntity { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateRepo.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateRepo.java deleted file mode 100644 index ad61d56..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zsvg.vboot.it.proj.cate; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ItProjCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMain.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMain.java deleted file mode 100644 index 65eb8ee..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMain.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zsvg.vboot.it.proj.main; - -import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class ItProjMain extends BaseMainEntity { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainRepo.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainRepo.java deleted file mode 100644 index e6d1464..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zsvg.vboot.it.proj.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ItProjMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateRepo.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateRepo.java deleted file mode 100644 index 4544cac..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zsvg.vboot.it.task.cate; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ItTaskCateRepo extends JpaRepository { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMain.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMain.java deleted file mode 100644 index 7b20b2e..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMain.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zsvg.vboot.it.task.main; - -import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class ItTaskMain extends BaseMainEntity { - - -} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainRepo.java b/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainRepo.java deleted file mode 100644 index ad9783d..0000000 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zsvg.vboot.it.task.main; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ItTaskMainRepo extends JpaRepository { - - -} diff --git a/vboot-extend-ps/pom.xml b/vboot-extend-ps/pom.xml new file mode 100644 index 0000000..a3bc4c0 --- /dev/null +++ b/vboot-extend-ps/pom.xml @@ -0,0 +1,22 @@ + + + + vboot + com.zsvg + 0.2 + + 4.0.0 + + vboot-extend-ps + + + + com.zsvg + vboot-core + ${vboot.version} + + + + \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCate.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCate.java new file mode 100644 index 0000000..ef647ab --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCate.java @@ -0,0 +1,25 @@ +package com.zsvg.vboot.ps.proj.cate; + +import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Setter +public class PsProjCate extends BaseCateEntity { + + @ManyToOne(fetch= FetchType.EAGER) + @JoinColumn(name = "pid") + private PsProjCate parent; + + @Transient + private List children = new ArrayList<>(); + + private String notes; + +} diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateApi.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateApi.java new file mode 100644 index 0000000..a709672 --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateApi.java @@ -0,0 +1,55 @@ +package com.zsvg.vboot.ps.proj.cate; + +import com.zsvg.vboot.common.mvc.api.RestResult; +import com.zsvg.vboot.common.mvc.dao.Sqler; +import com.zsvg.vboot.common.mvc.pojo.Ztree; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("ps/proj/cate") +public class PsProjCateApi { + + private String table = "ps_proj_cate"; + + @GetMapping + public RestResult get(String name) { + Sqler sqler = new Sqler(table); + sqler.addSelect("t.pid,t.crtim,t.uptim"); + sqler.addLike("t.name", name); + sqler.addOrder("t.ornum"); + return RestResult.ok(service.findTree(sqler)); + } + + @GetMapping("one/{id}") + public RestResult getOne(@PathVariable String id) { + PsProjCate cate = service.findOne(id); + return RestResult.ok(cate); + } + + @GetMapping("tree") + public RestResult getTree(String name) { + List list = service.findTreeList(table,name); + return RestResult.ok(list); + } + + @PostMapping + public RestResult post(@RequestBody PsProjCate main) { + return RestResult.ok(service.insert(main)); + } + + @PutMapping + public RestResult put(@RequestBody PsProjCate main) { + return RestResult.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public RestResult delete(@PathVariable String[] ids) { + return RestResult.ok(service.delete(ids)); + } + + @Autowired + private PsProjCateService service; +} \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateRepo.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateRepo.java new file mode 100644 index 0000000..852735c --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.ps.proj.cate; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PsProjCateRepo extends JpaRepository { + + +} diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateService.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateService.java new file mode 100644 index 0000000..52f9204 --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/cate/PsProjCateService.java @@ -0,0 +1,66 @@ +package com.zsvg.vboot.ps.proj.cate; + +import com.zsvg.vboot.common.mvc.dao.Sqler; +import com.zsvg.vboot.common.mvc.service.BaseCateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.BeanPropertyRowMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.List; + +@Service +public class PsProjCateService extends BaseCateService { + + public List findTree(Sqler sqler) { + List list = jdbcDao.getTp().query(sqler.getSql(), sqler.getParams(), new BeanPropertyRowMapper<>(PsProjCate.class)); + return buildByRecursive(list); + } + + //使用递归方法建树 + private List buildByRecursive(List nodes) { + List list = new ArrayList<>(); + for (PsProjCate node : nodes) { + if (node.getPid() == null) { + list.add(findChildrenByTier(node, nodes)); + } else { + boolean flag = false; + for (PsProjCate node2 : nodes) { + if (node.getPid().equals(node2.getId())) { + flag = true; + break; + } + } + if (!flag) { + list.add(findChildrenByTier(node, nodes)); + } + } + } + return list; + } + + + //递归查找子节点 + private PsProjCate findChildrenByTier(PsProjCate node, List nodes) { + for (PsProjCate item : nodes) { + if (node.getId().equals(item.getPid())) { + if (node.getChildren() == null) { + node.setChildren(new ArrayList<>()); + } + node.getChildren().add(findChildrenByTier(item, nodes)); + } + } + return node; + } + + + //----------bean注入------------ + @Autowired + private PsProjCateRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } +} diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMain.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMain.java new file mode 100644 index 0000000..e609260 --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMain.java @@ -0,0 +1,23 @@ +package com.zsvg.vboot.ps.proj.main; + +import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; +import com.zsvg.vboot.ps.proj.cate.PsProjCate; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +public class PsProjMain extends BaseMainEntity { + + @Transient + private String cid; + + @ManyToOne(fetch= FetchType.EAGER) + @JoinColumn(name = "cid") + private PsProjCate cate; + + private String notes; +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainApi.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainApi.java similarity index 71% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainApi.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainApi.java index 8828318..77d51ff 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainApi.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.proj.main; +package com.zsvg.vboot.ps.proj.main; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; @@ -6,10 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("it/proj/main") -public class ItProjMainApi { +@RequestMapping("ps/proj/main") +public class PsProjMainApi { - private String table = "it_proj_main"; + private String table = "ps_proj_main"; @GetMapping public RestResult get(String name) { @@ -20,17 +20,17 @@ public class ItProjMainApi { @GetMapping("one/{id}") public RestResult getOne(@PathVariable String id) { - ItProjMain main = service.findOne(id); + PsProjMain main = service.findOne(id); return RestResult.ok(main); } @PostMapping - public RestResult post(@RequestBody ItProjMain main) { + public RestResult post(@RequestBody PsProjMain main) { return RestResult.ok(service.insert(main)); } @PutMapping - public RestResult put(@RequestBody ItProjMain main) { + public RestResult put(@RequestBody PsProjMain main) { return RestResult.ok(service.update(main)); } @@ -40,6 +40,6 @@ public class ItProjMainApi { } @Autowired - private ItProjMainService service; + private PsProjMainService service; } \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainRepo.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainRepo.java new file mode 100644 index 0000000..b19127e --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.ps.proj.main; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PsProjMainRepo extends JpaRepository { + + +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainService.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainService.java similarity index 73% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainService.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainService.java index be887c8..cf13d3b 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainService.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/proj/main/PsProjMainService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.task.main; +package com.zsvg.vboot.ps.proj.main; import com.zsvg.vboot.common.mvc.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; @@ -7,11 +7,11 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @Service -public class ItTaskMainService extends BaseMainService { +public class PsProjMainService extends BaseMainService { //----------bean注入------------ @Autowired - private ItTaskMainRepo repo; + private PsProjMainRepo repo; @PostConstruct public void initDao() { diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCate.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCate.java similarity index 65% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCate.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCate.java index e4cc9f5..fdfe272 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCate.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCate.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.task.cate; +package com.zsvg.vboot.ps.task.cate; import com.zsvg.vboot.common.mvc.entity.BaseCateEntity; import lombok.Getter; @@ -9,7 +9,7 @@ import javax.persistence.Entity; @Entity @Getter @Setter -public class ItTaskCate extends BaseCateEntity { +public class PsTaskCate extends BaseCateEntity { } diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateApi.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateApi.java similarity index 72% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateApi.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateApi.java index a5c52ab..f12efa5 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/cate/ItTaskCateApi.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.task.cate; +package com.zsvg.vboot.ps.task.cate; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; @@ -6,10 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("it/task/cate") -public class ItTaskCateApi { +@RequestMapping("ps/task/cate") +public class PsTaskCateApi { - private String table = "it_task_cate"; + private String table = "ps_task_cate"; @GetMapping public RestResult get(String name) { @@ -21,17 +21,17 @@ public class ItTaskCateApi { @GetMapping("one/{id}") public RestResult getOne(@PathVariable String id) { - ItTaskCate cate = service.findOne(id); + PsTaskCate cate = service.findOne(id); return RestResult.ok(cate); } @PostMapping - public RestResult post(@RequestBody ItTaskCate cate) { + public RestResult post(@RequestBody PsTaskCate cate) { return RestResult.ok(service.insert(cate)); } @PutMapping - public RestResult put(@RequestBody ItTaskCate cate) { + public RestResult put(@RequestBody PsTaskCate cate) { return RestResult.ok(service.update(cate)); } @@ -41,6 +41,6 @@ public class ItTaskCateApi { } @Autowired - private ItTaskCateService service; + private PsTaskCateService service; } \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateRepo.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateRepo.java new file mode 100644 index 0000000..b024acd --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.ps.task.cate; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PsTaskCateRepo extends JpaRepository { + + +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateService.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateService.java similarity index 73% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateService.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateService.java index a8c332f..031b1ac 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/cate/ItProjCateService.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/cate/PsTaskCateService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.proj.cate; +package com.zsvg.vboot.ps.task.cate; import com.zsvg.vboot.common.mvc.service.BaseCateService; import org.springframework.beans.factory.annotation.Autowired; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @Service -public class ItProjCateService extends BaseCateService { +public class PsTaskCateService extends BaseCateService { //----------bean注入------------ @Autowired - private ItProjCateRepo repo; + private PsTaskCateRepo repo; @PostConstruct public void initDao() { diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskList.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskList.java new file mode 100644 index 0000000..259b5a3 --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskList.java @@ -0,0 +1,24 @@ +package com.zsvg.vboot.ps.task.list; + +import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; +import com.zsvg.vboot.ps.proj.cate.PsProjCate; +import com.zsvg.vboot.ps.proj.main.PsProjMain; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +public class PsTaskList extends BaseMainEntity { + + @Transient + private String projid; + + @ManyToOne(fetch= FetchType.EAGER) + @JoinColumn(name = "projid") + private PsProjMain proj; + + +} diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListApi.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListApi.java new file mode 100644 index 0000000..bbe60ba --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListApi.java @@ -0,0 +1,45 @@ +package com.zsvg.vboot.ps.task.list; + +import com.zsvg.vboot.common.mvc.api.RestResult; +import com.zsvg.vboot.common.mvc.dao.Sqler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("ps/task/list") +public class PsTaskListApi { + + private String table = "ps_task_list"; + + @GetMapping + public RestResult get(String name) { + Sqler sqler = new Sqler(table); + sqler.addLike("t.name", name); + return RestResult.ok(service.findMapList(sqler)); + } + + @GetMapping("one/{id}") + public RestResult getOne(@PathVariable String id) { + PsTaskList main = service.findOne(id); + return RestResult.ok(main); + } + + @PostMapping + public RestResult post(@RequestBody PsTaskList main) { + return RestResult.ok(service.insert(main)); + } + + @PutMapping + public RestResult put(@RequestBody PsTaskList main) { + return RestResult.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public RestResult delete(@PathVariable String[] ids) { + return RestResult.ok(service.delete(ids)); + } + + @Autowired + private PsTaskListService service; + +} \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListRepo.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListRepo.java new file mode 100644 index 0000000..4228fad --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.ps.task.list; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PsTaskListRepo extends JpaRepository { + + +} diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListService.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListService.java new file mode 100644 index 0000000..2c61e42 --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/list/PsTaskListService.java @@ -0,0 +1,21 @@ +package com.zsvg.vboot.ps.task.list; + +import com.zsvg.vboot.common.mvc.service.BaseMainService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; + +@Service +public class PsTaskListService extends BaseMainService { + + + //----------bean注入------------ + @Autowired + private PsTaskListRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } +} \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMain.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMain.java new file mode 100644 index 0000000..0ae719d --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMain.java @@ -0,0 +1,24 @@ +package com.zsvg.vboot.ps.task.main; + +import com.zsvg.vboot.common.mvc.entity.BaseMainEntity; +import com.zsvg.vboot.ps.proj.main.PsProjMain; +import com.zsvg.vboot.ps.task.list.PsTaskList; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +public class PsTaskMain extends BaseMainEntity { + + @Transient + private String listid; + + @ManyToOne(fetch= FetchType.EAGER) + @JoinColumn(name = "listid") + private PsTaskList list; + + +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainApi.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainApi.java similarity index 71% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainApi.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainApi.java index 6ee63b6..1a7e6f8 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/task/main/ItTaskMainApi.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainApi.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.task.main; +package com.zsvg.vboot.ps.task.main; import com.zsvg.vboot.common.mvc.api.RestResult; import com.zsvg.vboot.common.mvc.dao.Sqler; @@ -6,10 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("it/task/main") -public class ItTaskMainApi { +@RequestMapping("ps/task/main") +public class PsTaskMainApi { - private String table = "it_task_main"; + private String table = "ps_task_main"; @GetMapping public RestResult get(String name) { @@ -20,17 +20,17 @@ public class ItTaskMainApi { @GetMapping("one/{id}") public RestResult getOne(@PathVariable String id) { - ItTaskMain main = service.findOne(id); + PsTaskMain main = service.findOne(id); return RestResult.ok(main); } @PostMapping - public RestResult post(@RequestBody ItTaskMain main) { + public RestResult post(@RequestBody PsTaskMain main) { return RestResult.ok(service.insert(main)); } @PutMapping - public RestResult put(@RequestBody ItTaskMain main) { + public RestResult put(@RequestBody PsTaskMain main) { return RestResult.ok(service.update(main)); } @@ -40,6 +40,6 @@ public class ItTaskMainApi { } @Autowired - private ItTaskMainService service; + private PsTaskMainService service; } \ No newline at end of file diff --git a/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainRepo.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainRepo.java new file mode 100644 index 0000000..32d0a2f --- /dev/null +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainRepo.java @@ -0,0 +1,8 @@ +package com.zsvg.vboot.ps.task.main; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PsTaskMainRepo extends JpaRepository { + + +} diff --git a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainService.java b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainService.java similarity index 73% rename from vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainService.java rename to vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainService.java index e304703..ed47202 100644 --- a/vboot-extend-bi/src/main/java/com/zsvg/vboot/it/proj/main/ItProjMainService.java +++ b/vboot-extend-ps/src/main/java/com/zsvg/vboot/ps/task/main/PsTaskMainService.java @@ -1,4 +1,4 @@ -package com.zsvg.vboot.it.proj.main; +package com.zsvg.vboot.ps.task.main; import com.zsvg.vboot.common.mvc.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; @@ -7,16 +7,17 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @Service -public class ItProjMainService extends BaseMainService { +public class PsTaskMainService extends BaseMainService { //----------bean注入------------ @Autowired - private ItProjMainRepo repo; + private PsTaskMainRepo repo; @PostConstruct public void initDao() { super.setRepo(repo); } + }