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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhangshilin
2018-03-28 13:06:09 +08:00
parent 6e533fca41 03e14ab15a
commit 4af1f01e90
12 changed files with 224 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/domain/configuration/DnsIpCfg.java
View File

@@ -141,6 +141,7 @@ public class DnsIpCfg extends BaseEntity<DnsIpCfg> {
private String lable; private String lable;
private String cfgIds; private String cfgIds;
private String fakeIds;
public String getCfgIds() { public String getCfgIds() {
return cfgIds; return cfgIds;
@@ -348,5 +349,19 @@ public class DnsIpCfg extends BaseEntity<DnsIpCfg> {
public void setSearchAuditTimeEnd(Date searchAuditTimeEnd) { public void setSearchAuditTimeEnd(Date searchAuditTimeEnd) {
this.searchAuditTimeEnd = searchAuditTimeEnd; this.searchAuditTimeEnd = searchAuditTimeEnd;
} }
/**
* fakeIds
* @return fakeIds
*/
public String getFakeIds() {
return fakeIds;
}
/**
* @param fakeIds the fakeIds to set
*/
public void setFakeIds(String fakeIds) {
this.fakeIds = fakeIds;
}
} }

6
src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
View File

@@ -78,10 +78,10 @@ public class DnsIpCfgController extends BaseController {
@RequestMapping("delete") @RequestMapping("delete")
public String delete(Model model, HttpServletRequest request, public String delete(Model model, HttpServletRequest request,
HttpServletResponse response, DnsIpCfg dnsIpCfg) { HttpServletResponse response, DnsIpCfg dnsIpCfg) {
String cfgIds = dnsIpCfg.getCfgIds(); String fakeIds = dnsIpCfg.getFakeIds();
if (!StringUtils.isEmpty(cfgIds)) { if (!StringUtils.isEmpty(fakeIds)) {
try { try {
dnsIpCfgService.delete(cfgIds); dnsIpCfgService.delete(fakeIds);
addMessage(model, "delete_success"); addMessage(model, "delete_success");
} catch (Exception e) { } catch (Exception e) {
logger.error("删除失败", e); logger.error("删除失败", e);

4
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java
View File

@@ -1,10 +1,12 @@
package com.nis.web.dao.configuration; package com.nis.web.dao.configuration;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.DnsIpCfg; import com.nis.domain.configuration.DnsIpCfg;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao; import com.nis.web.dao.MyBatisDao;
@MyBatisDao @MyBatisDao
public interface DnsIpCfgDao extends CrudDao<DnsIpCfg> { public interface DnsIpCfgDao extends CrudDao<DnsIpCfg> {
public int deleteByFakeId(@Param("fakeId") String fakeIds);
} }

7
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -141,5 +141,12 @@
is_valid=0 is_valid=0
where cfg_id=#{cfgId} where cfg_id=#{cfgId}
</update> </update>
<update id="deleteByFakeId">
update
dns_ip_cfg
set
is_valid=0
where fake_id =#{fakeId}
</update>
</mapper> </mapper>

24
src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -16,13 +17,13 @@ import com.nis.domain.maat.MaatDnsIpCfg;
import com.nis.domain.maat.ToMaatDnsIpBean; import com.nis.domain.maat.ToMaatDnsIpBean;
import com.nis.main.ConvertTool; import com.nis.main.ConvertTool;
import com.nis.util.Collections3; import com.nis.util.Collections3;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.DnsIpCfgDao; import com.nis.web.dao.configuration.DnsIpCfgDao;
import com.nis.web.service.CrudService; import com.nis.web.service.CrudService;
@Service @Service
public class DnsIpCfgService extends CrudService<DnsIpCfgDao, DnsIpCfg>{ public class DnsIpCfgService extends CrudService<DnsIpCfgDao, DnsIpCfg>{
@Autowired
private DnsIpCfgDao dnsIpCfgDao;
@Override @Override
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void save(DnsIpCfg dnsIpCfg) { public void save(DnsIpCfg dnsIpCfg) {
@@ -72,27 +73,24 @@ public class DnsIpCfgService extends CrudService<DnsIpCfgDao, DnsIpCfg>{
} }
} }
public void delete(String cfgIds) { public void delete(String fakeIds) {
if(cfgIds.endsWith(","))cfgIds=cfgIds.substring(0,cfgIds.lastIndexOf(",")); if(fakeIds.endsWith(","))fakeIds=fakeIds.substring(0,fakeIds.lastIndexOf(","));
String[] cfgIdsArr = cfgIds.split(","); String[] fakeIdsArr = fakeIds.split(",");
for (String cfgId : cfgIdsArr) { for (String fakeId : fakeIdsArr) {
DnsIpCfg d = new DnsIpCfg(); dnsIpCfgDao.deleteByFakeId(fakeId);
d.setCfgId(Long.valueOf(cfgId));
dao.delete(d);
} }
//给配置转换层发送、接收结果 //给配置转换层发送、接收结果
String sendJson = "{\"fakeId\":[" + cfgIds + "]}"; String sendJson = "{\"fakeId\":[" + fakeIds + "]}";
logger.info("准备下发配置：" + sendJson); logger.info("准备下发配置：" + sendJson);
Boolean recv = true; Boolean recv = true;
try { try {
recv = new ConvertTool().invalidDNSIPConfig(sendJson); recv = new ConvertTool().invalidDNSIPConfig(sendJson);
} catch (Throwable e) { } catch (Throwable e) {
logger.error("欺骗ip配置删除失败:通讯异常,cfgIds:" + cfgIds, e); logger.error("欺骗ip配置删除失败:通讯异常,fakeIds:" + fakeIds, e);
throw new RuntimeException("欺骗ip配置删除失败:通讯失败"); throw new RuntimeException("欺骗ip配置删除失败:通讯失败");
} }
if (!recv) { if (!recv) {
logger.error("欺骗ip配置删除失败,收到结果 " + recv + " ,cfgIds:" + cfgIds); logger.error("欺骗ip配置删除失败,收到结果 " + recv + " ,fakeIds:" + fakeIds);
throw new RuntimeException("欺骗ip配置删除失败"); throw new RuntimeException("欺骗ip配置删除失败");
} }
} }

7
src/main/resources/messages/message_en.properties
View File

@@ -19,6 +19,7 @@ show=show
edit=edit edit=edit
hi=hi hi=hi
exit=exit exit=exit
choose=choose
#============menu begin====================== #============menu begin======================
requestInfo=requestInfo requestInfo=requestInfo
@@ -40,15 +41,12 @@ sip_ip_control=sip ip control
domain_control_white=domain control white domain_control_white=domain control white
ip_address_control=ip address control ip_address_control=ip address control
ip_control=ip control ip_control=ip control
ip_port_control=ip port control
domain_control=domain control domain_control=domain control
dns_control=dns control dns_control=dns control
basic_configuration=basic configuration basic_configuration=basic configuration
letter_from=letter from letter_from=letter from
classification_manage=classification manage classification_manage=classification manage
attribute_manage=attribute manage
area_manage=area manage area_manage=area manage
isp_manage=isp manage
feature_scope_manage=feature scope manage feature_scope_manage=feature scope manage
special_tasks=special tasks special_tasks=special tasks
label_manage=label manage label_manage=label manage
@@ -94,12 +92,9 @@ log_search=log search
sysService_manage=system service manage sysService_manage=system service manage
service_manage=service type manage service_manage=service type manage
system_service_manage=system service type manage system_service_manage=system service type manage
specific_service_cfg=specific service cfg
features_area=features area features_area=features area
attribute_manage=attribute manage attribute_manage=attribute manage
isp_manage=isp manage isp_manage=isp manage
feature_scope_manage=feature scope manage
plaintext_manage=plaintext manage
ip_multiple_control=ip multiple control ip_multiple_control=ip multiple control
ip_port_control=ip port control ip_port_control=ip port control
website_multiple_control=website multiple control website_multiple_control=website multiple control

6
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -69,8 +69,9 @@
checkboxes.each(function(){ checkboxes.each(function(){
ids = ids + $(this).attr("id") + ","; ids = ids + $(this).attr("id") + ",";
}); });
console.log(ids);
if (confirm("<spring:message code='confirm_message'/>")) { if (confirm("<spring:message code='confirm_message'/>")) {
$("#cfgIds").val(ids); $("#fakeIds").val(ids);
$("#searchForm").attr("action","${ctx}/cfg/dnsIp/delete"); $("#searchForm").attr("action","${ctx}/cfg/dnsIp/delete");
$("#searchForm").submit(); $("#searchForm").submit();
} }
@@ -105,6 +106,7 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${dnsIpCfg.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${dnsIpCfg.isFilterAction }"/>
<input id="cfgIds" name="cfgIds" type="hidden"/> <input id="cfgIds" name="cfgIds" type="hidden"/>
<input id="fakeIds" name="fakeIds" type="hidden"/>
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
@@ -270,7 +272,7 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${page.list }" var="dnsIpCfg" varStatus="status" step="1"> <c:forEach items="${page.list }" var="dnsIpCfg" varStatus="status" step="1">
<td><input type="checkbox" class="i-checks child-checks" id="${dnsIpCfg.cfgId}" value="${dnsIpCfg.isAudit}"></td> <td><input type="checkbox" class="i-checks child-checks" id="${dnsIpCfg.fakeId}" value="${dnsIpCfg.isAudit}"></td>
<td>${dnsIpCfg.cfgDesc }</td> <td>${dnsIpCfg.cfgDesc }</td>
<td>V${dnsIpCfg.ipType }</td> <td>V${dnsIpCfg.ipType }</td>
<td>${dnsIpCfg.srcIp }</td> <td>${dnsIpCfg.srcIp }</td>

186
src/main/webapp/WEB-INF/views/sys/officeForm.jsp
View File

@@ -29,142 +29,170 @@
</script> </script>
</head> </head>
<body> <body>
<ul class="nav nav-tabs"> <div class="page-content">
<li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构列表</a></li> <div class="row">
<li class="active"><a href="${ctx}/sys/office/form?id=${office.id}&parent.id=${office.parent.id}">机构<shiro:hasPermission name="sys:office:edit">${not empty office.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:office:edit">查看</shiro:lacksPermission></a></li> <div class="col-md-12">
</ul><br/> <div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i><c:if test="${not empty office.id}"><spring:message code="edit"/></c:if><c:if test="${empty office.id}"><spring:message code="add"/></c:if></div>
</div>
<div class="portlet-body form">
<!-- <ul class="nav nav-tabs"> -->
<%-- <li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构列表</a></li> --%>
<%-- <li class="active"><a href="${ctx}/sys/office/form?id=${office.id}&parent.id=${office.parent.id}">机构<shiro:hasPermission name="sys:office:edit">${not empty office.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:office:edit">查看</shiro:lacksPermission></a></li> --%>
<!-- </ul><br/> -->
<form:form id="inputForm" modelAttribute="sysOffice" action="${ctx}/sys/office/saveOrUpdate" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="sysOffice" action="${ctx}/sys/office/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="control-group"> <div class="form-body">
<label class="control-label">上级机构:</label> <div class="form-group">
<div class="controls"> <label class="col-md-3 control-label">上级机构:</label>
<div class="col-md-4">
<sys:treeselect id="office" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}" <sys:treeselect id="office" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}"
title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="" allowClear="${office.currentUser.admin}"/> title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="form-control" allowClear="${office.currentUser.admin}"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">归属区域:</label> <label class="col-md-3 control-label">归属区域:</label>
<div class="controls"> <div class="col-md-4">
<sys:treeselect id="area" name="area.id" value="${office.area.id}" labelName="area.name" labelValue="${office.area.name}" <sys:treeselect id="area" name="area.id" value="${office.area.id}" labelName="area.name" labelValue="${office.area.name}"
title="区域" url="/sys/area/treeData" cssClass="required" allowClear="${office.currentUser.admin}"/> title="区域" url="/sys/area/treeData" cssClass="required form-control" allowClear="${office.currentUser.admin}"/>
<font color="red">*</font>
</div> </div>
<span class="help-inline"><font color="red">*</font></span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构名称:</label>
<div class="col-md-4">
<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
</div> </div>
<div class="control-group">
<label class="control-label">机构名称:</label>
<div class="controls">
<form:input path="name" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> <div class="form-group">
<div class="control-group"> <label class="col-md-3 control-label">机构编码:</label>
<label class="control-label">机构编码:</label> <div class="col-md-4">
<div class="controls"> <form:input path="code" htmlEscape="false" maxlength="50" class="form-control"/>
<form:input path="code" htmlEscape="false" maxlength="50"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">机构类型:</label> <label class="col-md-3 control-label">机构类型:</label>
<div class="controls"> <div class="col-md-4">
<form:select path="type" class="input-medium"> <form:select path="type" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_OFFICE_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:options items="${fns:getDictList('SYS_OFFICE_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select> </form:select>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">机构级别:</label> <label class="col-md-3 control-label">机构级别:</label>
<div class="controls"> <div class="col-md-4">
<form:select path="grade" class="input-medium"> <form:select path="grade" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_OFFICE_GRADE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:options items="${fns:getDictList('SYS_OFFICE_GRADE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select> </form:select>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">机构职责分类:</label> <label class="col-md-3 control-label">机构职责分类:</label>
<div class="controls"> <div class="col-md-4">
<form:select path="jobType" class="input-medium"> <form:select path="jobType" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_JOB_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:options items="${fns:getDictList('SYS_JOB_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select> </form:select>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">是否可用:</label> <label class="col-md-3 control-label">是否可用:</label>
<div class="controls"> <div class="col-md-4">
<form:select path="useable"> <form:select path="useable" class="selectpicker select2">
<form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select> </form:select>
<span class="help-inline">“是”代表此账号允许登陆，“否”则表示此账号不允许登陆</span> <span class="help-inline">“是”代表此账号允许登陆，“否”则表示此账号不允许登陆</span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">主负责人:</label> <label class="col-md-3 control-label">主负责人:</label>
<div class="controls"> <div class="col-md-4">
<sys:treeselect id="primaryPerson" name="primaryPerson.id" value="${office.primaryPerson.id}" labelName="office.primaryPerson.name" labelValue="${office.primaryPerson.name}" <sys:treeselect id="primaryPerson" name="primaryPerson.id" value="${office.primaryPerson.id}" labelName="office.primaryPerson.name" labelValue="${office.primaryPerson.name}"
title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true"/> title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">副负责人:</label> <label class="col-md-3 control-label">副负责人:</label>
<div class="controls"> <div class="col-md-4">
<sys:treeselect id="deputyPerson" name="deputyPerson.id" value="${office.deputyPerson.id}" labelName="office.deputyPerson.name" labelValue="${office.deputyPerson.name}" <sys:treeselect id="deputyPerson" name="deputyPerson.id" value="${office.deputyPerson.id}" labelName="office.deputyPerson.name" labelValue="${office.deputyPerson.name}"
title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true"/> title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">联系地址:</label> <label class="col-md-3 control-label">联系地址:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="address" htmlEscape="false" maxlength="50"/> <form:input path="address" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">邮政编码:</label> <label class="col-md-3 control-label">邮政编码:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="zipCode" htmlEscape="false" maxlength="50"/> <form:input path="zipCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">负责人:</label> <label class="col-md-3 control-label">负责人:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="master" htmlEscape="false" maxlength="50"/> <form:input path="master" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">电话:</label> <label class="col-md-3 control-label">电话:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="phone" htmlEscape="false" maxlength="50"/> <form:input path="phone" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">传真:</label> <label class="col-md-3 control-label">传真:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="fax" htmlEscape="false" maxlength="50"/> <form:input path="fax" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">邮箱:</label> <label class="col-md-3 control-label">邮箱:</label>
<div class="controls"> <div class="col-md-4">
<form:input path="email" htmlEscape="false" maxlength="50"/> <form:input path="email" htmlEscape="false" maxlength="50" class="form-control"/>
</div> </div>
</div> </div>
<div class="control-group"> <div class="form-group">
<label class="control-label">备注:</label> <label class="col-md-3 control-label">备注:</label>
<div class="controls"> <div class="col-md-4">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/> <form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge form-control"/>
</div> </div>
</div> </div>
<c:if test="${empty office.id}"> <c:if test="${empty office.id}">
<div class="control-group"> <div class="form-group">
<label class="control-label">快速添加下级部门:</label> <label class="col-md-3 control-label">快速添加下级部门:</label>
<div class="controls"> <div class="col-md-4">
<div class="mt-checkbox-inline">
<form:checkboxes path="childDeptList" items="${fns:getDictList('SYS_OFFICE_COMMON')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:checkboxes path="childDeptList" items="${fns:getDictList('SYS_OFFICE_COMMON')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
<span> </span>
</div>
</div> </div>
</div> </div>
</c:if> </c:if>
</div>
<div class="form-actions"> <div class="form-actions">
<shiro:hasPermission name="sys:office:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission> <div class="row">
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> <div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:office:edit">
<button type="submit" class="btn blue"><spring:message code="submit"></spring:message></button>
</shiro:hasPermission>
<button type="button" class="btn blue btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div>
</div>
</div> </div>
</form:form> </form:form>
</div>
</div>
</div>
</div>
</div>
</body> </body>
</html> </html>

30
src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
View File

@@ -7,23 +7,40 @@
<style type="text/css"> <style type="text/css">
.ztree {overflow:auto;margin:0;_margin-top:10px;padding:10px 0 0 10px;} .ztree {overflow:auto;margin:0;_margin-top:10px;padding:10px 0 0 10px;}
</style> </style>
<link href="${ctxStatic}/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css" rel="stylesheet" type="text/css"/> <link href="${ctxStatic}/global/plugins/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css" rel="stylesheet" type="text/css"/>
<script src="${ctxStatic}/jquery-ztree/3.5.12/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script> <script src="${ctxStatic}/global/plugins/jquery-ztree/3.5.12/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/global/scripts/mustache.js" type="text/javascript"></script>
</head> </head>
<body> <body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/sys/office/form?itType=${itType}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
</div>
<h3 class="page-title">
<spring:message code="officeManage"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div id="content" class="row-fluid"> <div id="content" class="row-fluid">
<div id="left" class="accordion-group"> <div id="left" class="accordion-group" style="display:inline-block;">
<div class="accordion-heading"> <div class="accordion-heading">
<a class="accordion-toggle">组织机构<i class="icon-refresh pull-right" onclick="refreshTree();"></i></a> <a class="accordion-toggle">组织机构<i class="icon-refresh pull-right" onclick="refreshTree();"></i></a>
</div> </div>
<div id="ztree" class="ztree"></div> <div id="ztree" class="ztree"></div>
</div>
<div id="openClose" class="close">&nbsp;</div> <div id="openClose" class="close">&nbsp;</div>
<div id="right"> </div>
<div id="right" style="display: inline-block">
<iframe id="officeContent" src="${ctx}/sys/office/list?id=&parentIds=" frameborder="no" width="100%" height="91%"></iframe> <iframe id="officeContent" src="${ctx}/sys/office/list?id=&parentIds=" frameborder="no" width="100%" height="91%"></iframe>
</div> </div>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
@@ -65,7 +82,8 @@
$(".ztree").width(leftWidth - 10).height(frameObj.height() - 46); $(".ztree").width(leftWidth - 10).height(frameObj.height() - 46);
} }
</script> </script>
<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/scripts/wsize.min.js" type="text/javascript"></script>
<%-- <script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script> --%>
</body> </body>

28
src/main/webapp/WEB-INF/views/sys/officeList.jsp
View File

@@ -5,8 +5,9 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>机构管理</title> <title>机构管理</title>
<link href="${ctxStatic}/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" /> <link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
<script src="${ctxStatic}/treeTable/jquery.treeTable.min.js" type="text/javascript"></script> <script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
<script src="${ctxStatic}/global/scripts/mustache.min.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var tpl = $("#treeTableTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,""); var tpl = $("#treeTableTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
@@ -26,7 +27,6 @@
for (var i=0; i<data.length; i++){ for (var i=0; i<data.length; i++){
var row = data[i]; var row = data[i];
var value = ${fns:jsGetVal('row.parentId')}; var value = ${fns:jsGetVal('row.parentId')};
if(!value){ if(!value){
value = 0; value = 0;
@@ -50,16 +50,30 @@
</script> </script>
</head> </head>
<body> <body>
<ul class="nav nav-tabs"> <div class="page-content">
<li class="active"><a href="${ctx}/sys/office/list?id=${sysOffice.id}&parentIds=${sysOffice.parentIds}">机构列表</a></li>
<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission>
</ul>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<!-- <ul class="nav nav-tabs"> -->
<%-- <li class="active"><a href="${ctx}/sys/office/list?id=${sysOffice.id}&parentIds=${sysOffice.parentIds}">机构列表</a></li> --%>
<%-- <shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission> --%>
<!-- </ul> -->
<div class="table-responsive">
<sys:message content="${message}"/> <sys:message content="${message}"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed"> <table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>机构名称</th><th>归属区域</th><th>机构编码</th><th>所属级别</th><th>机构类型</th><th>机构职责分类</th><th>备注</th><shiro:hasPermission name="sys:office:edit"><th>操作</th></shiro:hasPermission></tr></thead> <thead><tr><th>机构名称</th><th>归属区域</th><th>机构编码</th><th>所属级别</th><th>机构类型</th><th>机构职责分类</th><th>备注</th><shiro:hasPermission name="sys:office:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody id="treeTableList"></tbody> <tbody id="treeTableList"></tbody>
</table> </table>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/template" id="treeTableTpl"> <script type="text/template" id="treeTableTpl">
<tr id="{{row.id}}" pId="{{pid}}"> <tr id="{{row.id}}" pId="{{pid}}">
<td><a href="${ctx}/sys/office/form?id={{row.id}}">{{row.name}}</a></td> <td><a href="${ctx}/sys/office/form?id={{row.id}}">{{row.name}}</a></td>

7
src/main/webapp/static/global/scripts/mustache.min.js vendored Normal file
View File

@@ -0,0 +1,7 @@
/*!
* mustache.js - Logic-less {{mustache}} templates with JavaScript
* http://github.com/janl/mustache.js
*/
(function(a,b){if(typeof exports==="object"&&exports){b(exports)}else{var c={};b(c);if(typeof define==="function"&&define.amd){define(c)}else{a.Mustache=c}}}(this,function(a){var f=/\s*/;var m=/\s+/;var k=/\S/;var i=/\s*=/;var o=/\s*\}/;var u=/#|\^|\/|>|\{|&|=|!/;var g=RegExp.prototype.test;function t(A,z){return g.call(A,z)}function h(z){return !t(k,z)}var w=Object.prototype.toString;var l=Array.isArray||function(z){return w.call(z)==="[object Array]"};function b(z){return typeof z==="function"}function e(z){return z.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var d={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;"};function n(z){return String(z).replace(/[&<>"'\/]/g,function(A){return d[A]})}function v(z){this.string=z;this.tail=z;this.pos=0}v.prototype.eos=function(){return this.tail===""};v.prototype.scan=function(B){var A=this.tail.match(B);if(A&&A.index===0){var z=A[0];this.tail=this.tail.substring(z.length);this.pos+=z.length;return z}return""};v.prototype.scanUntil=function(B){var A=this.tail.search(B),z;switch(A){case -1:z=this.tail;this.tail="";break;case 0:z="";break;default:z=this.tail.substring(0,A);this.tail=this.tail.substring(A)}this.pos+=z.length;return z};function s(z,A){this.view=z==null?{}:z;this.parent=A;this._cache={".":this.view}}s.make=function(z){return(z instanceof s)?z:new s(z)};s.prototype.push=function(z){return new s(z,this)};s.prototype.lookup=function(z){var C;if(z in this._cache){C=this._cache[z]}else{var B=this;while(B){if(z.indexOf(".")>0){C=B.view;var D=z.split("."),A=0;while(C!=null&&A<D.length){C=C[D[A++]]}}else{C=B.view[z]}if(C!=null){break}B=B.parent}this._cache[z]=C}if(b(C)){C=C.call(this.view)}return C};function q(){this.clearCache()}q.prototype.clearCache=function(){this._cache={};this._partialCache={}};q.prototype.compile=function(B,z){var A=this._cache[B];if(!A){var C=a.parse(B,z);A=this._cache[B]=this.compileTokens(C,B)}return A};q.prototype.compilePartial=function(A,C,z){var B=this.compile(C,z);
this._partialCache[A]=B;return B};q.prototype.getPartial=function(z){if(!(z in this._partialCache)&&this._loadPartial){this.compilePartial(z,this._loadPartial(z))}return this._partialCache[z]};q.prototype.compileTokens=function(B,A){var z=this;return function(C,E){if(E){if(b(E)){z._loadPartial=E}else{for(var D in E){z.compilePartial(D,E[D])}}}return p(B,z,s.make(C),A)}};q.prototype.render=function(B,z,A){return this.compile(B)(z,A)};function p(H,B,z,K){var E="";function A(N){return B.render(N,z)}var C,I,J;for(var F=0,G=H.length;F<G;++F){C=H[F];I=C[1];switch(C[0]){case"#":J=z.lookup(I);if(typeof J==="object"||typeof J==="string"){if(l(J)){for(var D=0,M=J.length;D<M;++D){E+=p(C[4],B,z.push(J[D]),K)}}else{if(J){E+=p(C[4],B,z.push(J),K)}}}else{if(b(J)){var L=K==null?null:K.slice(C[3],C[5]);J=J.call(z.view,L,A);if(J!=null){E+=J}}else{if(J){E+=p(C[4],B,z,K)}}}break;case"^":J=z.lookup(I);if(!J||(l(J)&&J.length===0)){E+=p(C[4],B,z,K)}break;case">":J=B.getPartial(I);if(b(J)){E+=J(z)}break;case"&":J=z.lookup(I);if(J!=null){E+=J}break;case"name":J=z.lookup(I);if(J!=null){E+=a.escape(J)}break;case"text":E+=I;break}}return E}function y(F){var A=[];var E=A;var G=[];var C;for(var B=0,z=F.length;B<z;++B){C=F[B];switch(C[0]){case"#":case"^":G.push(C);E.push(C);E=C[4]=[];break;case"/":var D=G.pop();D[5]=C[2];E=G.length>0?G[G.length-1][4]:A;break;default:E.push(C)}}return A}function c(E){var B=[];var D,A;for(var C=0,z=E.length;C<z;++C){D=E[C];if(D){if(D[0]==="text"&&A&&A[0]==="text"){A[1]+=D[1];A[3]=D[3]}else{A=D;B.push(D)}}}return B}function r(z){return[new RegExp(e(z[0])+"\\s*"),new RegExp("\\s*"+e(z[1]))]}function x(P,F){P=P||"";F=F||a.tags;if(typeof F==="string"){F=F.split(m)}if(F.length!==2){throw new Error("Invalid tags: "+F.join(", "))}var J=r(F);var B=new v(P);var H=[];var G=[];var E=[];var Q=false;var O=false;function N(){if(Q&&!O){while(E.length){delete G[E.pop()]}}else{E=[]}Q=false;O=false}var C,A,I,K,D,z;while(!B.eos()){C=B.pos;I=B.scanUntil(J[0]);if(I){for(var L=0,M=I.length;L<M;++L){K=I.charAt(L);if(h(K)){E.push(G.length)
}else{O=true}G.push(["text",K,C,C+1]);C+=1;if(K=="\n"){N()}}}if(!B.scan(J[0])){break}Q=true;A=B.scan(u)||"name";B.scan(f);if(A==="="){I=B.scanUntil(i);B.scan(i);B.scanUntil(J[1])}else{if(A==="{"){I=B.scanUntil(new RegExp("\\s*"+e("}"+F[1])));B.scan(o);B.scanUntil(J[1]);A="&"}else{I=B.scanUntil(J[1])}}if(!B.scan(J[1])){throw new Error("Unclosed tag at "+B.pos)}D=[A,I,C,B.pos];G.push(D);if(A==="#"||A==="^"){H.push(D)}else{if(A==="/"){z=H.pop();if(!z){throw new Error('Unopened section "'+I+'" at '+C)}if(z[1]!==I){throw new Error('Unclosed section "'+z[1]+'" at '+C)}}else{if(A==="name"||A==="{"||A==="&"){O=true}else{if(A==="="){F=I.split(m);if(F.length!==2){throw new Error("Invalid tags at "+C+": "+F.join(", "))}J=r(F)}}}}}z=H.pop();if(z){throw new Error('Unclosed section "'+z[1]+'" at '+B.pos)}return y(c(G))}a.name="mustache.js";a.version="0.7.3";a.tags=["{{","}}"];a.Scanner=v;a.Context=s;a.Writer=q;a.parse=x;a.escape=n;var j=new q();a.clearCache=function(){return j.clearCache()};a.compile=function(A,z){return j.compile(A,z)};a.compilePartial=function(A,B,z){return j.compilePartial(A,B,z)};a.compileTokens=function(A,z){return j.compileTokens(A,z)};a.render=function(B,z,A){return j.render(B,z,A)};a.to_html=function(C,A,B,D){var z=a.render(C,A,B);if(b(D)){D(z)}else{return z}}}));

19
src/main/webapp/static/global/scripts/wsize.min.js vendored Normal file
View File

@@ -0,0 +1,19 @@
/*!
* Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
*
* 主框架窗口大小调整
* @author ThinkGem
* @version 2013-11-09
*/
$("#left").width(leftWidth);
$("#openClose").click(function(){if($(this).hasClass("close")){
$(this).removeClass("close");
$(this).addClass("open");
$("#left").animate({width:0,opacity:"hide"});
$("#right").animate({width:$("#content").width()-$("#openClose").width()-5},function(){
if(typeof openCloseClickCallBack=="function"){openCloseClickCallBack(true)}wSize()})}
else{$(this).addClass("close");$(this).removeClass("open");$("#left").animate({width:leftWidth,opacity:"show"});
$("#right").animate({width:$("#content").width()-$("#openClose").width()-leftWidth-9},
function(){if(typeof openCloseClickCallBack=="function"){openCloseClickCallBack(true)}wSize()})}});
if(!Array.prototype.map){Array.prototype.map=function(e,d){var a=[],b=0;for(var c=0,f=this.length;c<f;c++){if(c in this){a[b++]=e.call(d,this[c],c,this)}}return a}}var getWindowSize=function(){return["Height","Width"].map(function(a){return window["inner"+a]||document.compatMode==="CSS1Compat"&&document.documentElement["client"+a]||document.body["client"+a]})};$(window).resize(function(){wSize()});
wSize();