From 16f4cc0d9a93b2ec80591eef209ccaeb1ea7d37e Mon Sep 17 00:00:00 2001 From: sk1551 <15175617877@163.com> Date: Thu, 16 Apr 2020 09:11:04 +0800 Subject: [PATCH] 20200407-lc-1 --- ruoyi-ui/src/views/system/school/index.vue | 16 +- ruoyi/pom.xml | 577 +++++++++--------- .../system/controller/BySchoolController.java | 26 +- .../ruoyi/project/system/domain/BySchool.java | 6 + 4 files changed, 333 insertions(+), 292 deletions(-) diff --git a/ruoyi-ui/src/views/system/school/index.vue b/ruoyi-ui/src/views/system/school/index.vue index b8d65c147..33f40f9ee 100644 --- a/ruoyi-ui/src/views/system/school/index.vue +++ b/ruoyi-ui/src/views/system/school/index.vue @@ -188,7 +188,7 @@ <el-input v-model="form.mastername" placeholder="请输入联系人" /> </el-form-item> <el-form-item label="电话" prop="tel"> - <el-input v-model="form.tel" placeholder="请输入电话" /> + <el-input v-model="form.tel" placeholder="请输入电话" maxlength="11" /> </el-form-item> <el-form-item label="紧急联系人" prop="emMan"> <el-input v-model="form.emMan" placeholder="请输入紧急联系人" /> @@ -370,7 +370,19 @@ export default { // 表单校验 rules: { schoolName: [ - { required: true, message: "机构名称不能为空", trigger: "blur" } + { + required: true, + message: "机构名称不能为空", + trigger: "blur" + } + ], + tel: [ + { + required: true, + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号码", + trigger: "blur" + } ] } }; diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml index 15470d888..52eaa7e40 100644 --- a/ruoyi/pom.xml +++ b/ruoyi/pom.xml @@ -1,287 +1,292 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi</artifactId> - <version>2.2.0</version> - <packaging>jar</packaging> - - <name>ruoyi</name> - <url>http://www.benyiedu.com</url> - <description>本一智慧平台管理系统</description> - - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>2.1.1.RELEASE</version> - <relativePath /> - </parent> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> - <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version> - <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version> - <fastjson.version>1.2.47</fastjson.version> - <druid.version>1.1.14</druid.version> - <commons.io.version>2.5</commons.io.version> - <commons.fileupload.version>1.3.3</commons.fileupload.version> - <bitwalker.version>1.19</bitwalker.version> - <jwt.version>0.9.0</jwt.version> - <swagger.version>2.9.2</swagger.version> - <poi.version>3.17</poi.version> - <oshi.version>3.9.1</oshi.version> - <velocity.version>1.7</velocity.version> - </properties> - - <dependencies> - - <!-- SpringBoot 核心包 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - - <!-- SpringBoot 测试 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - - <!-- SpringBoot 拦截器 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-aop</artifactId> - </dependency> - - <!-- SpringBoot Web容器 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - - <!-- spring-boot-devtools --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <optional>true</optional> <!-- 表示依赖不会传递 --> - </dependency> - - <!-- spring security 安全认证 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - - <!-- redis 缓存操作 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-redis</artifactId> - </dependency> - - <!-- pool 对象池 --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-pool2</artifactId> - </dependency> - - <!-- Mysql驱动包 --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- SpringBoot集成mybatis框架 --> - <dependency> - <groupId>org.mybatis.spring.boot</groupId> - <artifactId>mybatis-spring-boot-starter</artifactId> - <version>${mybatis.spring.boot.starter.version}</version> - </dependency> - - <!-- pagehelper 分页插件 --> - <dependency> - <groupId>com.github.pagehelper</groupId> - <artifactId>pagehelper-spring-boot-starter</artifactId> - <version>${pagehelper.spring.boot.starter.version}</version> - </dependency> - - <!--阿里数据库连接池 --> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>druid-spring-boot-starter</artifactId> - <version>${druid.version}</version> - </dependency> - - <!--常用工具类 --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <!--io常用工具类 --> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - </dependency> - - <!--文件上传工具类 --> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> - </dependency> - - <!-- 解析客户端操作系统、浏览器等 --> - <dependency> - <groupId>eu.bitwalker</groupId> - <artifactId>UserAgentUtils</artifactId> - <version>${bitwalker.version}</version> - </dependency> - - <!-- 阿里JSON解析器 --> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>fastjson</artifactId> - <version>${fastjson.version}</version> - </dependency> - - <!--Spring框架基本的核心工具--> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - - <!--Token生成与解析--> - <dependency> - <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt</artifactId> - <version>${jwt.version}</version> - </dependency> - - <!-- swagger2--> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>${swagger.version}</version> - <exclusions> - <exclusion> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>io.swagger</groupId> - <artifactId>swagger-models</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!--防止进入swagger页面报类型转换错误,排除2.9.2中的引用,手动增加1.5.21版本--> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - <version>1.5.21</version> - </dependency> - - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-models</artifactId> - <version>1.5.21</version> - </dependency> - - <!-- swagger2-UI--> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>${swagger.version}</version> - </dependency> - - <!-- 获取系统信息 --> - <dependency> - <groupId>com.github.oshi</groupId> - <artifactId>oshi-core</artifactId> - <version>${oshi.version}</version> - </dependency> - - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - </dependency> - - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna-platform</artifactId> - </dependency> - - <!-- excel工具 --> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - <version>${poi.version}</version> - </dependency> - - <!--velocity代码生成使用模板 --> - <dependency> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>${velocity.version}</version> - </dependency> - - <!-- 定时任务 --> - <dependency> - <groupId>org.quartz-scheduler</groupId> - <artifactId>quartz</artifactId> - <exclusions> - <exclusion> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 --> - </configuration> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>public</id> - <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>public</id> - <name>aliyun nexus</name> - <url>http://maven.aliyun.com/nexus/content/groups/public/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi</artifactId> + <version>2.2.0</version> + <packaging>jar</packaging> + + <name>ruoyi</name> + <url>http://www.benyiedu.com</url> + <description>本一智慧平台管理系统</description> + + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>2.1.1.RELEASE</version> + <relativePath /> + </parent> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <java.version>1.8</java.version> + <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version> + <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version> + <fastjson.version>1.2.47</fastjson.version> + <druid.version>1.1.14</druid.version> + <commons.io.version>2.5</commons.io.version> + <commons.fileupload.version>1.3.3</commons.fileupload.version> + <bitwalker.version>1.19</bitwalker.version> + <jwt.version>0.9.0</jwt.version> + <swagger.version>2.9.2</swagger.version> + <poi.version>3.17</poi.version> + <oshi.version>3.9.1</oshi.version> + <velocity.version>1.7</velocity.version> + </properties> + + <dependencies> + + <!-- SpringBoot 核心包 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + </dependency> + + <!-- SpringBoot 测试 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + + <!-- SpringBoot 拦截器 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-aop</artifactId> + </dependency> + + <!-- SpringBoot Web容器 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + + <!-- spring-boot-devtools --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <optional>true</optional> <!-- 表示依赖不会传递 --> + </dependency> + + <!-- spring security 安全认证 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + </dependency> + + <!-- redis 缓存操作 --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-redis</artifactId> + </dependency> + + <!-- pool 对象池 --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-pool2</artifactId> + </dependency> + + <!-- Mysql驱动包 --> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- SpringBoot集成mybatis框架 --> + <dependency> + <groupId>org.mybatis.spring.boot</groupId> + <artifactId>mybatis-spring-boot-starter</artifactId> + <version>${mybatis.spring.boot.starter.version}</version> + </dependency> + + <!-- pagehelper 分页插件 --> + <dependency> + <groupId>com.github.pagehelper</groupId> + <artifactId>pagehelper-spring-boot-starter</artifactId> + <version>${pagehelper.spring.boot.starter.version}</version> + </dependency> + + <!--阿里数据库连接池 --> + <dependency> + <groupId>com.alibaba</groupId> + <artifactId>druid-spring-boot-starter</artifactId> + <version>${druid.version}</version> + </dependency> + + <!--常用工具类 --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <!--io常用工具类 --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> + + <!--文件上传工具类 --> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${commons.fileupload.version}</version> + </dependency> + + <!-- 解析客户端操作系统、浏览器等 --> + <dependency> + <groupId>eu.bitwalker</groupId> + <artifactId>UserAgentUtils</artifactId> + <version>${bitwalker.version}</version> + </dependency> + + <!-- 阿里JSON解析器 --> + <dependency> + <groupId>com.alibaba</groupId> + <artifactId>fastjson</artifactId> + <version>${fastjson.version}</version> + </dependency> + + <!--Spring框架基本的核心工具--> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> + + <!--Token生成与解析--> + <dependency> + <groupId>io.jsonwebtoken</groupId> + <artifactId>jjwt</artifactId> + <version>${jwt.version}</version> + </dependency> + + <!-- swagger2--> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger2</artifactId> + <version>${swagger.version}</version> + <exclusions> + <exclusion> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>io.swagger</groupId> + <artifactId>swagger-models</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!--防止进入swagger页面报类型转换错误,排除2.9.2中的引用,手动增加1.5.21版本--> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + <version>1.5.21</version> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-models</artifactId> + <version>1.5.21</version> + </dependency> + + <!-- swagger2-UI--> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>${swagger.version}</version> + </dependency> + + <!-- 获取系统信息 --> + <dependency> + <groupId>com.github.oshi</groupId> + <artifactId>oshi-core</artifactId> + <version>${oshi.version}</version> + </dependency> + + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + </dependency> + + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + </dependency> + + <!-- excel工具 --> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>${poi.version}</version> + </dependency> + + <!--velocity代码生成使用模板 --> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>${velocity.version}</version> + </dependency> + + <!-- 定时任务 --> + <dependency> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <exclusions> + <exclusion> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>5.1.5.RELEASE</version> + </dependency> + + </dependencies> + + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 --> + </configuration> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>public</id> + <name>aliyun nexus</name> + <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>public</id> + <name>aliyun nexus</name> + <url>http://maven.aliyun.com/nexus/content/groups/public/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </project> \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java index 6551b3c2b..3f4dd0a5b 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java @@ -5,6 +5,7 @@ import java.util.List; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.project.system.service.ISysDeptService; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -25,12 +26,19 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.project.system.domain.SysDept; +import javax.annotation.Resource; + /** * 幼儿园机构Controller * * @author tsbz * @date 2020-04-08 */ + + + + + @RestController @RequestMapping("/system/school") public class BySchoolController extends BaseController @@ -78,14 +86,24 @@ public class BySchoolController extends BaseController return AjaxResult.success(bySchoolService.selectBySchoolById(id)); } + + /** * 新增幼儿园机构 */ + + //调取jdbctemplate方法 读取数据库中的ID值 + @Resource + private JdbcTemplate jdbcTemplate; + @PreAuthorize("@ss.hasPermi('system:school:add')") @Log(title = "幼儿园机构", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BySchool bySchool) { + //从school表中取出当前最大的ID值 并且将其赋值给dept中的ordernumber + String maxId = jdbcTemplate.queryForObject(String.format("select MAX(id) from by_school"),String.class); + String uuid = getUUID32(); //将UUID赋值给xxdm @@ -93,18 +111,18 @@ public class BySchoolController extends BaseController bySchool.setCreateUser(SecurityUtils.getLoginUser().getUser().getUserId()); bySchool.setApprovalUser(SecurityUtils.getLoginUser().getUser().getUserId()); bySchool.setCreateTime(new Date()); - //bySchoolService.insertBySchool(bySchool); + //创建dept实例 并且向要添加的dept中设置各个参数 SysDept dept = new SysDept(); dept.setSchoolId(bySchool.getXxdm()); dept.setCreateBy(SecurityUtils.getUsername()); - //dept.setDeptId(bySchool.getDept().getDeptId()); dept.setParentId(200L); dept.setAncestors("0,100,200"); dept.setDeptName(bySchool.getSchoolName()); - //dept.setPhone(bySchool.getTel()); - //dept.setOrderNum(String.valueOf(bySchool.getId())); + dept.setOrderNum(maxId); + dept.setPhone(bySchool.getTel()); dept.setLeader(SecurityUtils.getUsername()); + //插入数据 deptService.insertDept(dept); return toAjax(bySchoolService.insertBySchool(bySchool)); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java index 1691c72b9..00f5c33fc 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/BySchool.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.web.domain.BaseEntity; + import java.util.Date; /** @@ -12,10 +13,15 @@ import java.util.Date; * @author tsbz * @date 2020-04-08 */ + + + public class BySchool extends BaseEntity { private static final long serialVersionUID = 1L; + + /** 幼儿园ID */ private Long id;