gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修改数据库连接；2、系统菜单增加function_id字段属性

Browse Source
This commit is contained in:
zhangwei
2018-05-18 09:55:39 +08:00
parent 6b7ecb9a46
commit 195892e369
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/domain/SysMenu.java
View File

@@ -52,6 +52,7 @@ public class SysMenu extends BaseEntity<SysMenu>{
private String menuBg; private String menuBg;
private Integer isTop; private Integer isTop;
private Integer functionId;
private List<SysMenu> children = new ArrayList<SysMenu>(); private List<SysMenu> children = new ArrayList<SysMenu>();
@@ -270,6 +271,14 @@ public class SysMenu extends BaseEntity<SysMenu>{
this.isTop = isTop; this.isTop = isTop;
} }
public Integer getFunctionId() {
return functionId;
}
public void setFunctionId(Integer functionId) {
this.functionId = functionId;
}
} }

12
src/main/java/com/nis/web/dao/SysMenuDao.xml
View File

@@ -23,7 +23,8 @@
a.quick_action, a.quick_action,
a.menu_bg, a.menu_bg,
p.name AS "parent.name", p.name AS "parent.name",
a.is_top a.is_top,
a.function_id
</sql> </sql>
@@ -88,7 +89,8 @@
update_date, update_date,
remarks, remarks,
del_flag, del_flag,
is_top is_top,
function_id
) VALUES ( ) VALUES (
#{parent.id}, #{parent.id},
#{parentIds}, #{parentIds},
@@ -106,7 +108,8 @@
#{updateDate}, #{updateDate},
#{remarks}, #{remarks},
#{delFlag}, #{delFlag},
#{isTop} #{isTop},
#{functionId}
) )
</insert> </insert>
@@ -125,7 +128,8 @@
update_by = #{updateBy.id}, update_by = #{updateBy.id},
update_date = #{updateDate}, update_date = #{updateDate},
remarks = #{remarks}, remarks = #{remarks},
is_top = #{isTop} is_top = #{isTop},
function_id=#{functionId}
WHERE id = #{id} WHERE id = #{id}
</update> </update>

8
src/main/resources/jdbc.properties
View File

@@ -1,10 +1,10 @@
#jdbc for oracle #jdbc for oracle
#jdbc.driver=oracle.jdbc.driver.OracleDriver #jdbc.driver=oracle.jdbc.driver.OracleDriver
jdbc.devlop.driver=com.mysql.jdbc.Driver jdbc.devlop.driver=com.mysql.jdbc.Driver
jdbc.devlop.url=jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.devlop.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
jdbc.devlop.username=dfh jdbc.devlop.username=root
jdbc.devlop.key=xLtQB+Bp6joOYrVIfBdrRA== jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q==
jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg== jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g==
jdbc.product.driver=oracle.jdbc.driver.OracleDriver jdbc.product.driver=oracle.jdbc.driver.OracleDriver
#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180)))) #jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180))))

8
src/main/webapp/WEB-INF/views/sys/menuForm.jsp
View File

@@ -107,6 +107,14 @@
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="function id"/>:</label>
<div class="col-md-4">
<form:input path="functionId" htmlEscape="false" maxlength="10" class="form-control"/>
<span class="help-inline"><spring:message code="function_id"/></span>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="icon"/>:</label> <label class="col-md-3 control-label"><spring:message code="icon"/>:</label>
<div class="col-md-4"> <div class="col-md-4">