Skip to content

H
Huangyu
Commit a760cd2f authored by 黄瑜's avatar 黄瑜
Browse files
Options

更新

parent aeb789e6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 366 deletions
.idea/encodings.xml
View file @ a760cd2f
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dao" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/domain" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/service" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/web" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/web/src/main/sql/SpringMvcTemplate.sql" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
maven/repository/com/haomostudio/SpringMVCTemplate/SpringMVCTemplate/0.0.1-SNAPSHOT/_remote.repositories
View file @ a760cd2f
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Oct 09 18:09:05 CST 2018
#Wed Oct 10 15:26:51 CST 2018
SpringMVCTemplate-0.0.1-SNAPSHOT.pom>=
maven/repository/com/haomostudio/SpringMVCTemplate/SpringMVCTemplate/0.0.1-SNAPSHOT/maven-metadata-local.xml
View file @ a760cd2f
......@@ -7,12 +7,12 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20181009100905</lastUpdated>
<lastUpdated>20181010072652</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100905</updated>
<updated>20181010072652</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
......
maven/repository/com/haomostudio/SpringMVCTemplate/SpringMVCTemplate/maven-metadata-local.xml
View file @ a760cd2f
......@@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20181009100905</lastUpdated>
<lastUpdated>20181010072652</lastUpdated>
</versioning>
</metadata>
maven/repository/com/haomostudio/SpringMVCTemplate/dao/0.0.1-SNAPSHOT/_remote.repositories
View file @ a760cd2f
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Oct 09 18:09:12 CST 2018
#Wed Oct 10 15:26:59 CST 2018
dao-0.0.1-SNAPSHOT.pom>=
dao-0.0.1-SNAPSHOT.jar>=
maven/repository/com/haomostudio/SpringMVCTemplate/dao/0.0.1-SNAPSHOT/maven-metadata-local.xml
View file @ a760cd2f
......@@ -7,17 +7,17 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20181009100912</lastUpdated>
<lastUpdated>20181010072659</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100912</updated>
<updated>20181010072659</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100912</updated>
<updated>20181010072659</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
......
maven/repository/com/haomostudio/SpringMVCTemplate/dao/maven-metadata-local.xml
View file @ a760cd2f
......@@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20181009100912</lastUpdated>
<lastUpdated>20181010072659</lastUpdated>
</versioning>
</metadata>
maven/repository/com/haomostudio/SpringMVCTemplate/domain/0.0.1-SNAPSHOT/_remote.repositories
View file @ a760cd2f
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Oct 09 18:09:12 CST 2018
#Wed Oct 10 15:26:58 CST 2018
domain-0.0.1-SNAPSHOT.pom>=
domain-0.0.1-SNAPSHOT.jar>=
maven/repository/com/haomostudio/SpringMVCTemplate/domain/0.0.1-SNAPSHOT/maven-metadata-local.xml
View file @ a760cd2f
......@@ -7,17 +7,17 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20181009100912</lastUpdated>
<lastUpdated>20181010072658</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100912</updated>
<updated>20181010072658</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100912</updated>
<updated>20181010072658</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
......
maven/repository/com/haomostudio/SpringMVCTemplate/domain/maven-metadata-local.xml
View file @ a760cd2f
......@@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20181009100912</lastUpdated>
<lastUpdated>20181010072658</lastUpdated>
</versioning>
</metadata>
maven/repository/com/haomostudio/SpringMVCTemplate/service/0.0.1-SNAPSHOT/_remote.repositories
View file @ a760cd2f
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Oct 09 18:09:14 CST 2018
#Wed Oct 10 15:27:01 CST 2018
service-0.0.1-SNAPSHOT.pom>=
service-0.0.1-SNAPSHOT.jar>=
maven/repository/com/haomostudio/SpringMVCTemplate/service/0.0.1-SNAPSHOT/maven-metadata-local.xml
View file @ a760cd2f
......@@ -7,17 +7,17 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20181009100914</lastUpdated>
<lastUpdated>20181010072701</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100914</updated>
<updated>20181010072701</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100914</updated>
<updated>20181010072701</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
......
maven/repository/com/haomostudio/SpringMVCTemplate/service/maven-metadata-local.xml
View file @ a760cd2f
......@@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20181009100914</lastUpdated>
<lastUpdated>20181010072701</lastUpdated>
</versioning>
</metadata>
maven/repository/com/haomostudio/SpringMVCTemplate/web/0.0.1-SNAPSHOT/_remote.repositories
View file @ a760cd2f
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Oct 09 18:09:20 CST 2018
#Wed Oct 10 15:27:07 CST 2018
web-0.0.1-SNAPSHOT.pom>=
web-0.0.1-SNAPSHOT.war>=
maven/repository/com/haomostudio/SpringMVCTemplate/web/0.0.1-SNAPSHOT/maven-metadata-local.xml
View file @ a760cd2f
......@@ -7,17 +7,17 @@
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20181009100920</lastUpdated>
<lastUpdated>20181010072707</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>war</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100920</updated>
<updated>20181010072707</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-SNAPSHOT</value>
<updated>20181009100920</updated>
<updated>20181010072707</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
......
maven/repository/com/haomostudio/SpringMVCTemplate/web/maven-metadata-local.xml
View file @ a760cd2f
......@@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20181009100920</lastUpdated>
<lastUpdated>20181010072707</lastUpdated>
</versioning>
</metadata>
web/src/main/java/com/haomostudio/SpringMVCTemplate/controller/TesRoleController.java
View file @ a760cd2f
......@@ -43,23 +43,22 @@ public class TesRoleController {
TesRole item = new TesRole();
String id = Tools.getUUID();
item.setId(id);
if( name != null ){
if (name != null) {
item.setName(name);
}
if( description != null ){
if (description != null) {
item.setDescription(description);
}
if( menu_id != null ){
if (menu_id != null) {
item.setMenuId(menu_id);
}
if( create_date != null ){
if (create_date != null) {
item.setCreateDate(Tools.convertStringToDate(create_date, "yyyy-MM-dd HH:mm:ss"));
}
if( last_update_time != null ){
if (last_update_time != null) {
item.setLastUpdateTime(Tools.convertStringToDate(last_update_time, "yyyy-MM-dd HH:mm:ss"));
}
tesRoleService.create(item);
//若request param为null，但字段定义有默认值，则需从数据库中返回结果
return tesRoleService.get(id);
//return item;
......@@ -105,19 +104,19 @@ public class TesRoleController {
return Resp.fail("the asset to be edited doesn't exist");
}
if( name != null ){
if (name != null) {
item.setName(name);
}
if( description != null ){
if (description != null) {
item.setDescription(description);
}
if( menu_id != null ){
if (menu_id != null) {
item.setMenuId(menu_id);
}
if( create_date != null ){
if (create_date != null) {
item.setCreateDate(Tools.convertStringToDate(create_date, "yyyy-MM-dd HH:mm:ss"));
}
if( last_update_time != null ){
if (last_update_time != null) {
item.setLastUpdateTime(Tools.convertStringToDate(last_update_time, "yyyy-MM-dd HH:mm:ss"));
}
tesRoleService.update(item);
......@@ -140,7 +139,7 @@ public class TesRoleController {
@RequestParam(value = "create_date", required = false) String create_date,
@RequestParam(value = "last_update_time", required = false) String last_update_time
) {
if(request.getMethod().equals("GET")){
if (request.getMethod().equals("GET")) {
TesRole item = tesRoleService.get(id);
if (null == item) {
response.setStatus(404);
......@@ -148,34 +147,32 @@ public class TesRoleController {
}
return item;
}
else if(request.getMethod().equals("PUT")){
} else if (request.getMethod().equals("PUT")) {
TesRole item = tesRoleService.get(id);
if (null == item) {
response.setStatus(404);
return Resp.fail("the asset to be edited doesn't exist");
}
if( name != null ){
if (name != null) {
item.setName(name);
}
if( description != null ){
if (description != null) {
item.setDescription(description);
}
if( menu_id != null ){
if (menu_id != null) {
item.setMenuId(menu_id);
}
if( create_date != null ){
if (create_date != null) {
item.setCreateDate(Tools.convertStringToDate(create_date, "yyyy-MM-dd HH:mm:ss"));
}
if( last_update_time != null ){
if (last_update_time != null) {
item.setLastUpdateTime(Tools.convertStringToDate(last_update_time, "yyyy-MM-dd HH:mm:ss"));
}
tesRoleService.update(item);
return tesRoleService.get(id);
}
else if(request.getMethod().equals("DELETE")){
} else if (request.getMethod().equals("DELETE")) {
TesRole item = tesRoleService.get(id);
if (null == item) {
response.setStatus(404);
......@@ -190,7 +187,7 @@ public class TesRoleController {
@ApiOperation(value = "查询'TESROLE'表中的多条记录或者新增某条记录", notes = "get传参：根据url传入的filters（过滤条件），查询对应的多条数据。数据数量取决于page_no和page_size；数据的先后顺序取决于sort_item，sort_order； post请求：新增某条记录，传入表字段对应的值")
@RequestMapping(value = "/tes_roles",
method = { RequestMethod.GET, RequestMethod.POST },
method = {RequestMethod.GET, RequestMethod.POST},
produces = "application/json;charset=UTF-8")
@ResponseBody
public Object getTesRoles(
......@@ -210,20 +207,20 @@ public class TesRoleController {
@RequestParam(value = "refers", required = false) String refers,
@RequestParam(value = "relates", required = false) String relates
) {
if(request.getMethod().equals("GET")){
if(pageNo == null){
if (request.getMethod().equals("GET")) {
if (pageNo == null) {
pageNo = 1;
}
if(pageSize == null){
if (pageSize == null) {
pageSize = 10;
}
if(sortItem == null){
if (sortItem == null) {
sortItem = "id";
}
if(sortOrder == null){
if (sortOrder == null) {
sortOrder = "asc";
}
if(filters == null){
if (filters == null) {
filters = "{}";
}
......@@ -232,24 +229,23 @@ public class TesRoleController {
return tesRoleService.getListWithPagingAndFilter(
pageNo, pageSize, sortItem, sortOrder, filters, includes, refers, relates);
}
else{
} else {
TesRole item = new TesRole();
String id = Tools.getUUID();
item.setId(id);
if( name != null ){
if (name != null) {
item.setName(name);
}
if( description != null ){
if (description != null) {
item.setDescription(description);
}
if( menu_id != null ){
if (menu_id != null) {
item.setMenuId(menu_id);
}
if( create_date != null ){
if (create_date != null) {
item.setCreateDate(Tools.convertStringToDate(create_date, "yyyy-MM-dd HH:mm:ss"));
}
if( last_update_time != null ){
if (last_update_time != null) {
item.setLastUpdateTime(Tools.convertStringToDate(last_update_time, "yyyy-MM-dd HH:mm:ss"));
}
tesRoleService.create(item);
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesDepartmentMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id"/>
<id column="ID" jdbcType="VARCHAR" property="id"/>
<result column="NAME" jdbcType="VARCHAR" property="name"/>
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime"/>
<result column="LAST_UPDATE_TIME" jdbcType="TIMESTAMP" property="lastUpdateTime"/>
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesMenuGroupMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="SORT" jdbcType="VARCHAR" property="sort" />
<result column="MODULE_ID" jdbcType="VARCHAR" property="moduleId" />
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesMenuMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="URL" jdbcType="VARCHAR" property="url" />
<result column="GROUP_ID" jdbcType="VARCHAR" property="groupId" />
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesMenuModuleMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="SORT" jdbcType="INTEGER" property="sort" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesRoleMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="DESCRIPTION" jdbcType="VARCHAR" property="description" />
<result column="MENU_ID" jdbcType="VARCHAR" property="menuId" />
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TesUserMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="USERNAME" jdbcType="VARCHAR" property="username" />
<result column="PASSWORD" jdbcType="VARCHAR" property="password" />
<result column="DEPT_ID" jdbcType="VARCHAR" property="deptId" />
......
web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/TestRoleGroupMapper.xml
View file @ a760cd2f
......@@ -7,7 +7,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Mon Oct 08 10:08:33 CST 2018.
-->
<id column="ID" jdbcType="INTEGER" property="id" />
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="NAME" jdbcType="VARCHAR" property="name" />
<result column="ROLE_ID" jdbcType="VARCHAR" property="roleId" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
......@@ -176,7 +176,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
#{id,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
......
web/src/main/sql/SpringMvcTemplate.sql 0 → 100755
View file @ a760cd2f
/*==============================================================*/
/* Database name: db_test */
/* DBMS name: MySQL 5.7 */
/* Created on: 2018/9/30 17:18:06 */
/*==============================================================*/
drop database if exists db_test;
/*==============================================================*/
/* Database: db_test */
/*==============================================================*/
create database db_test;
use db_test;
/*==============================================================*/
/* Table: TEST_ROLE_GROUP */
/*==============================================================*/
create table TEST_ROLE_GROUP
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
ROLE_ID VARCHAR(30),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TEST_ROLE_GROUP comment '角色组';
/*==============================================================*/
/* Table: TES_DEPARTMENT */
/*==============================================================*/
create table TES_DEPARTMENT
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_DEPARTMENT comment '部门表';
/*==============================================================*/
/* Table: TES_MENU */
/*==============================================================*/
create table TES_MENU
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
URL VARCHAR(30),
GROUP_ID VARCHAR(30),
SORT INTEGER(10),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_MENU comment '菜单表';
/*==============================================================*/
/* Table: TES_MENU_GROUP */
/*==============================================================*/
create table TES_MENU_GROUP
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
SORT VARCHAR(30),
MODULE_ID VARCHAR(30),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_MENU_GROUP comment '模块组表';
/*==============================================================*/
/* Table: TES_MENU_MODULE */
/*==============================================================*/
create table TES_MENU_MODULE
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
SORT INTEGER(10),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_MENU_MODULE comment '菜单模块表';
/*==============================================================*/
/* Table: TES_ROLE */
/*==============================================================*/
create table TES_ROLE
(
ID VARCHAR(255) not null,
NAME VARCHAR(30),
DESCRIPTION VARCHAR(30),
MENU_ID VARCHAR(20),
CREATE_DATE DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_ROLE comment '角色表';
/*==============================================================*/
/* Table: TES_USER */
/*==============================================================*/
create table TES_USER
(
ID VARCHAR(255) not null,
USERNAME VARCHAR(32),
PASSWORD VARCHAR(30),
DEPT_ID VARCHAR(32),
STATUS VARCHAR(22),
ROLES_GROUP VARCHAR(32),
CREATE_TIME DATETIME,
LAST_UPDATE_TIME DATETIME,
primary key(ID)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;
alter table TES_USER comment '用户表';
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment