jiangjiazhi / center

Commit bcae7b3ff3944d9f9ec894af1fe742bd172cc471

Authored by fangcheng about 9 years ago

Exists in master

修改字段和登录页

Showing 3 changed files with 75 additions and 60 deletions

center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml
center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java
center.manager/src/main/webapp/WEB-INF/views/login/login.html

...	...	@@ -7,19 +7,20 @@
7	7	<id column="ID" property="id" />
8	8	<result column="TYPE" property="type" />
9	9	<result column="NAME" property="name" />
10		- <result column="PUBLISH_ID" property="publishId" />
11		- <result column="ENABLE" property="enable" />
12		- <result column="IFDEL" property="ifdel" />
13	10	<result column="REMARKS" property="remarks" />
14	11	<result column="SHORT_CODE" property="shortCode" />
15	12	<result column="ORG_ID" property="orgId" />
16		- <result column="CREATED" property="created" />
17		- <result column="MODIFIED" property="modified" />
	13	+ <result column="CREATE_ID" property="createId" />
	14	+ <result column="CREATE_TIME" property="createTime" />
	15	+ <result column="MODIFY_ID" property="modifyId" />
	16	+ <result column="MODIFY_TIME" property="modifyTime" />
	17	+ <result column="IFDEL" property="ifdel" />
	18	+ <result column="ENABLE" property="enable" />
18	19	</resultMap>
19	20
20	21	<!-- 通用查询结果列 -->
21	22	<sql id="Base_Column_List">
22		- ID AS id, TYPE AS type, NAME AS name, PUBLISH_ID AS publishId, ENABLE AS enable, IFDEL AS ifdel, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATED AS created, MODIFIED AS modified
	23	+ ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable
23	24	</sql>
24	25	</mapper>

1	1	package com.lyms.cm.entity.sys;
2	2
3	3	import com.baomidou.mybatisplus.annotations.TableId;
4		-import com.baomidou.mybatisplus.annotations.TableName;
5	4	import com.baomidou.mybatisplus.annotations.TableField;
	5	+import com.baomidou.mybatisplus.annotations.TableName;
6	6	import java.io.Serializable;
7	7	import java.util.Date;
8	8
...	...	@@ -12,7 +12,7 @@
12	12	* </p>
13	13	*
14	14	* @author fangcheng
15		- * @since 2017-03-07
	15	+ * @since 2017-03-10
16	16	*/
17	17	@TableName("SYS_ROLES")
18	18	public class SysRoles implements Serializable {
...	...	@@ -35,21 +35,6 @@
35	35	@TableField(value="NAME")
36	36	private String name;
37	37	/**
38		- *
39		- */
40		- @TableField(value="PUBLISH_ID")
41		- private String publishId;
42		- /**
43		- * 1：启用，2：停用
44		- */
45		- @TableField(value="ENABLE")
46		- private Integer enable;
47		- /**
48		- * 1：有效，2：无效
49		- */
50		- @TableField(value="IFDEL")
51		- private Integer ifdel;
52		- /**
53	38	* 备注
54	39	*/
55	40	@TableField(value="REMARKS")
56	41
...	...	@@ -67,13 +52,33 @@
67	52	/**
68	53	*
69	54	*/
70		- @TableField(value="CREATED")
71		- private Date created;
	55	+ @TableField(value="CREATE_ID")
	56	+ private String createId;
72	57	/**
73	58	*
74	59	*/
75		- @TableField(value="MODIFIED")
76		- private Date modified;
	60	+ @TableField(value="CREATE_TIME")
	61	+ private Date createTime;
	62	+ /**
	63	+ *
	64	+ */
	65	+ @TableField(value="MODIFY_ID")
	66	+ private String modifyId;
	67	+ /**
	68	+ *
	69	+ */
	70	+ @TableField(value="MODIFY_TIME")
	71	+ private Date modifyTime;
	72	+ /**
	73	+ *
	74	+ */
	75	+ @TableField(value="IFDEL")
	76	+ private Integer ifdel;
	77	+ /**
	78	+ *
	79	+ */
	80	+ @TableField(value="ENABLE")
	81	+ private Integer enable;
77	82
78	83
79	84	public String getId() {
...	...	@@ -100,30 +105,6 @@
100	105	this.name = name;
101	106	}
102	107
103		- public String getPublishId() {
104		- return publishId;
105		- }
106		-
107		- public void setPublishId(String publishId) {
108		- this.publishId = publishId;
109		- }
110		-
111		- public Integer getEnable() {
112		- return enable;
113		- }
114		-
115		- public void setEnable(Integer enable) {
116		- this.enable = enable;
117		- }
118		-
119		- public Integer getIfdel() {
120		- return ifdel;
121		- }
122		-
123		- public void setIfdel(Integer ifdel) {
124		- this.ifdel = ifdel;
125		- }
126		-
127	108	public String getRemarks() {
128	109	return remarks;
129	110	}
130	111
131	112
132	113
...	...	@@ -148,20 +129,52 @@
148	129	this.orgId = orgId;
149	130	}
150	131
151		- public Date getCreated() {
152		- return created;
	132	+ public String getCreateId() {
	133	+ return createId;
153	134	}
154	135
155		- public void setCreated(Date created) {
156		- this.created = created;
	136	+ public void setCreateId(String createId) {
	137	+ this.createId = createId;
157	138	}
158	139
159		- public Date getModified() {
160		- return modified;
	140	+ public Date getCreateTime() {
	141	+ return createTime;
161	142	}
162	143
163		- public void setModified(Date modified) {
164		- this.modified = modified;
	144	+ public void setCreateTime(Date createTime) {
	145	+ this.createTime = createTime;
	146	+ }
	147	+
	148	+ public String getModifyId() {
	149	+ return modifyId;
	150	+ }
	151	+
	152	+ public void setModifyId(String modifyId) {
	153	+ this.modifyId = modifyId;
	154	+ }
	155	+
	156	+ public Date getModifyTime() {
	157	+ return modifyTime;
	158	+ }
	159	+
	160	+ public void setModifyTime(Date modifyTime) {
	161	+ this.modifyTime = modifyTime;
	162	+ }
	163	+
	164	+ public Integer getIfdel() {
	165	+ return ifdel;
	166	+ }
	167	+
	168	+ public void setIfdel(Integer ifdel) {
	169	+ this.ifdel = ifdel;
	170	+ }
	171	+
	172	+ public Integer getEnable() {
	173	+ return enable;
	174	+ }
	175	+
	176	+ public void setEnable(Integer enable) {
	177	+ this.enable = enable;
165	178	}
166	179
167	180	}

...	...	@@ -55,6 +55,7 @@
55	55	<div id="id_password">
56	56	<input name="password" class="form-control border" placeholder="密码" type="password" data-required>
57	57	</div>
	58	+ <!--
58	59	<div class="form-group form-inline">
59	60	<input type="hidden" id="captcha_token" name="captcha_token" value="$!{captcha_token}">
60	61	<input type="text" id="captcha" name="captcha" class="form-control border" style="width: 175px;" placeholder="验证码" required="" maxlength="4">
...	...	@@ -65,7 +66,7 @@
65	66	<input type="checkbox" name="rememberMe" value="1"> 记住登录？
66	67	</label>
67	68	</div>
68		-
	69	+ -->
69	70	<div style="margin-top: 15px;">
70	71	<button id="loginButton" type="button" class="btn btn-success border" style="width:100%;">登录</button>
71	72	</div>