jiangjiazhi / regional-platform

Commit c9b305c7500619f2bdb913e398d654ff7a186bb0

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java
platform-biz-service/src/main/resources/mainOrm/Permissions.xml
platform-data-api/src/main/resources/database.properties

1	1	package com.lyms.platform.permission.model;
2	2
3	3
4		-
5	4	import com.lyms.platform.common.dao.BaseQuery;
6	5
7	6	import java.util.Date;
8	7
9	8
	9	+public class PermissionsQuery extends BaseQuery {
	10	+ private Integer id;
	11	+ private Integer type;
	12	+ private String moduleName;
	13	+ private String moduleCode;
	14	+ private String functionName;
	15	+ private String functionCode;
	16	+ private String permissionName;
	17	+ private String action;
	18	+ private String ext;
	19	+ private String url;
	20	+ private Integer publishId;
	21	+ private String publishName;
	22	+ private Integer yn;
	23	+ private Date modified;
	24	+ private Date created;
	25	+ private Integer ismenu;
10	26
11		-public class PermissionsQuery extends BaseQuery {private Integer id;private Integer type;private String moduleName;private String moduleCode;private String functionName;private String functionCode;private String permissionName;private String action;private String ext;private String url;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer ismenu;
12		-
13		-public Integer getId() {
	27	+ public Integer getId() {
14	28	return id;
15	29	}
16	30
17	31
18		-
19	32	public void setId(Integer id) {
20	33	this.id = id;
21	34
22	35	}
23	36
24		-public Integer getType() {
	37	+ public Integer getType() {
25	38	return type;
26	39	}
27	40
28	41
29		-
30	42	public void setType(Integer type) {
31	43	this.type = type;
32	44
33	45	}
34	46
35		-public String getModuleName() {
	47	+ public String getModuleName() {
36	48	return moduleName;
37	49	}
38	50
39	51
40		-
41	52	public void setModuleName(String moduleName) {
42	53	this.moduleName = moduleName;
43	54
44	55	}
45	56
46		-public String getModuleCode() {
	57	+ public String getModuleCode() {
47	58	return moduleCode;
48	59	}
49	60
50	61
51		-
52	62	public void setModuleCode(String moduleCode) {
53	63	this.moduleCode = moduleCode;
54	64
55	65	}
56	66
57		-public String getFunctionName() {
	67	+ public String getFunctionName() {
58	68	return functionName;
59	69	}
60	70
61	71
62		-
63	72	public void setFunctionName(String functionName) {
64	73	this.functionName = functionName;
65	74
66	75	}
67	76
68		-public String getFunctionCode() {
	77	+ public String getFunctionCode() {
69	78	return functionCode;
70	79	}
71	80
72	81
73		-
74	82	public void setFunctionCode(String functionCode) {
75	83	this.functionCode = functionCode;
76	84
77	85	}
78	86
79		-public String getPermissionName() {
	87	+ public String getPermissionName() {
80	88	return permissionName;
81	89	}
82	90
83	91
84		-
85	92	public void setPermissionName(String permissionName) {
86	93	this.permissionName = permissionName;
87	94
88	95	}
89	96
90		-public String getAction() {
	97	+ public String getAction() {
91	98	return action;
92	99	}
93	100
94	101
95		-
96	102	public void setAction(String action) {
97	103	this.action = action;
98	104
99	105	}
100	106
101		-public String getExt() {
	107	+ public String getExt() {
102	108	return ext;
103	109	}
104	110
105	111
106		-
107	112	public void setExt(String ext) {
108	113	this.ext = ext;
109	114
110	115	}
111	116
112		-public String getUrl() {
	117	+ public String getUrl() {
113	118	return url;
114	119	}
115	120
116	121
117		-
118	122	public void setUrl(String url) {
119	123	this.url = url;
120	124
121	125	}
122	126
123		-public Integer getPublishId() {
	127	+ public Integer getPublishId() {
124	128	return publishId;
125	129	}
126	130
127	131
128		-
129	132	public void setPublishId(Integer publishId) {
130	133	this.publishId = publishId;
131	134
132	135	}
133	136
134		-public String getPublishName() {
	137	+ public String getPublishName() {
135	138	return publishName;
136	139	}
137	140
138	141
139		-
140	142	public void setPublishName(String publishName) {
141	143	this.publishName = publishName;
142	144
143	145	}
144	146
145		-public Integer getYn() {
	147	+ public Integer getYn() {
146	148	return yn;
147	149	}
148	150
149	151
150		-
151	152	public void setYn(Integer yn) {
152	153	this.yn = yn;
153	154
154	155	}
155	156
156		-public Date getModified() {
	157	+ public Date getModified() {
157	158	return modified;
158	159	}
159	160
160	161
161		-
162	162	public void setModified(Date modified) {
163	163	this.modified = modified;
164	164
165	165	}
166	166
167		-public Date getCreated() {
	167	+ public Date getCreated() {
168	168	return created;
169	169	}
170	170
171	171
172		-
173	172	public void setCreated(Date created) {
174	173	this.created = created;
175	174
176	175	}
177	176
178		-public Integer getIsmenu() {
	177	+ public Integer getIsmenu() {
179	178	return ismenu;
180	179	}
181		-
182	180
183	181
184	182	public void setIsmenu(Integer ismenu) {

...	...	@@ -19,12 +19,13 @@
19	19	<result column="modified" property="modified" jdbcType="TIMESTAMP" />
20	20	<result column="created" property="created" jdbcType="TIMESTAMP" />
21	21	<result column="ismenu" property="ismenu" jdbcType="INTEGER" />
	22	+ <result column="weight" property="weight" jdbcType="INTEGER" />
22	23	</resultMap>
23	24
24	25
25	26
26	27	<insert id="addPermissions" parameterType="com.lyms.platform.permission.model.Permissions">
27		-insert into permissions (type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu) values (#{type},#{moduleName},#{moduleCode},#{functionName},#{functionCode},#{permissionName},#{action},#{ext},#{url},#{publishId},#{publishName},#{yn},#{modified},#{created},#{ismenu})
	28	+insert into permissions (type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight) values (#{type},#{moduleName},#{moduleCode},#{functionName},#{functionCode},#{permissionName},#{action},#{ext},#{url},#{publishId},#{publishName},#{yn},#{modified},#{created},#{ismenu},#{weight})
28	29	</insert>
29	30
30	31
...	...	@@ -75,6 +76,9 @@
75	76	<if test="ismenu != null and ismenu >= 0">
76	77	ismenu = #{ismenu,jdbcType=INTEGER},
77	78	</if>
	79	+ <if test="weight != null and weight >= 0">
	80	+ weight = #{weight,jdbcType=INTEGER},
	81	+ </if>
78	82	</set>
79	83	where id = #{id,jdbcType=INTEGER}
80	84	</update>
...	...	@@ -87,7 +91,7 @@
87	91
88	92
89	93	<select id="getPermissions" resultMap="PermissionsResultMap" parameterType="java.lang.Integer">
90		-select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu
	94	+select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight
91	95	from permissions where id = #{id,jdbcType=INTEGER}
92	96	</select>
93	97
94	98
...	...	@@ -154,13 +158,16 @@
154	158	<if test="ismenu != null and ismenu >= 0">
155	159	and ismenu = #{ismenu,jdbcType=INTEGER}
156	160	</if>
	161	+ <if test="weight != null and weight >= 0">
	162	+ and weight = #{weight,jdbcType=INTEGER},
	163	+ </if>
157	164	</where>
158	165	</sql>
159	166
160	167
161	168
162	169	<select id="queryPermissions" resultMap="PermissionsResultMap" parameterType="com.lyms.platform.permission.model.PermissionsQuery">
163		-select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu
	170	+select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu,weight
164	171	from permissions
165	172	<include refid="PermissionsCondition" />
166	173	<include refid="orderAndLimit" />

...	...	@@ -50,8 +50,8 @@
50	50
51	51	earlydata.driver=oracle.jdbc.driver.OracleDriver
52	52	earlydata.jdbcurl=jdbc:oracle:thin:@119.90.57.27:1521:orcl
53		-earlydata.username=LYMS_21
54		-earlydata.password=LYMS_21
	53	+earlydata.username=LYMS_QHDCESHI5
	54	+earlydata.password=LYMS_QHDCESHI5
55	55
56	56	earlydata.maxpoolsize=5
57	57	earlydata.initialpoolsize=2