Skip to content

H
hnxtbaboot
Commit ae9bf120 by wuchengwu
Options

设备管理-设备监控管理:添加设备采集信息统计，添加录入时间查询，添加隶属单位查询

parent a0f71c2f
Showing with 273 additions and 39 deletions
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
......@@ -40,9 +40,9 @@ public class SysClientVpController {
ResultMap resultMap=new ResultMap();
User user =(User)request.getSession().getAttribute("User");
//设备审批管理 默认查询本单位
if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("1")){
sysClientVp.setSsdwcode(user.getUnitcode());
}
// if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("1")){
// sysClientVp.setSsdwcode(user.getUnitcode());
// }
//我的设备管理 默认查询本人采集
if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("2")){
sysClientVp.setZrmjjh(user.getPolicemanid());
......
src/main/java/com/founder/cjqx/dao/SysClientVpMapper.java
......@@ -10,6 +10,20 @@ import java.util.List;
@Mapper
public interface SysClientVpMapper {
List<SysClientVp> selectPageList(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListycs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListzwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListzwwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListrxcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListrxwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListswcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListswwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListzjcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListzjwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListhmcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListhmwcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListsjcjs(SysClientVp sysClientVp);
List<SysClientVp> getRycjtjListsjwcjs(SysClientVp sysClientVp);
List<SysClientVp> selectClientVp(SysClientVp sysClientVp);
int selectPageCount(SysClientVp sysClientVp);
int saveSysClientVp(SysClientVp sysClientVp);
......
src/main/java/com/founder/model/SysClientVp.java
......@@ -13,6 +13,8 @@ public class SysClientVp extends PageBean{
private Date lrsj;
private Date rylrsj;
private String ip;
private String mac;
......@@ -125,6 +127,164 @@ public class SysClientVp extends PageBean{
private int yycsstr;
private String minlrsjStr;
private String maxlrsjStr;
private String ycs;//应采数
private String zwcjs;//指纹采集数
private String zwwcjs;//指纹未采集数
private String rxcjs;//人像采集数
private String hmcjs;//虹膜采集数
private String hmwcjs;//虹膜未采集数
private String rxwcjs;//人像未采集数
private String swcjs;//声纹采集数
private String swwcjs;//声纹未采集数
private String zjcjs;//足迹采集数
private String zjwcjs;//足迹未采集数
private String sjycs;//手机应采数
private String sjwcjs;//手机未采集数
public void setMinlrsjStr(String minlrsjStr) {
this.minlrsjStr = minlrsjStr;
}
public void setMaxlrsjStr(String maxlrsjStr) {
this.maxlrsjStr = maxlrsjStr;
}
public String getMinlrsjStr() {
return minlrsjStr;
}
public String getMaxlrsjStr() {
return maxlrsjStr;
}
public void setYcs(String ycs) {
this.ycs = ycs;
}
public void setZwcjs(String zwcjs) {
this.zwcjs = zwcjs;
}
public void setZwwcjs(String zwwcjs) {
this.zwwcjs = zwwcjs;
}
public void setRxcjs(String rxcjs) {
this.rxcjs = rxcjs;
}
public void setHmcjs(String hmcjs) {
this.hmcjs = hmcjs;
}
public void setHmwcjs(String hmwcjs) {
this.hmwcjs = hmwcjs;
}
public void setRxwcjs(String rxwcjs) {
this.rxwcjs = rxwcjs;
}
public void setSwcjs(String swcjs) {
this.swcjs = swcjs;
}
public void setSwwcjs(String swwcjs) {
this.swwcjs = swwcjs;
}
public void setZjcjs(String zjcjs) {
this.zjcjs = zjcjs;
}
public void setZjwcjs(String zjwcjs) {
this.zjwcjs = zjwcjs;
}
public void setSjycs(String sjycs) {
this.sjycs = sjycs;
}
public void setSjwcjs(String sjwcjs) {
this.sjwcjs = sjwcjs;
}
public String getYcs() {
return ycs;
}
public String getZwcjs() {
return zwcjs;
}
public String getZwwcjs() {
return zwwcjs;
}
public String getRxcjs() {
return rxcjs;
}
public String getHmcjs() {
return hmcjs;
}
public String getHmwcjs() {
return hmwcjs;
}
public String getRxwcjs() {
return rxwcjs;
}
public String getSwcjs() {
return swcjs;
}
public String getSwwcjs() {
return swwcjs;
}
public String getZjcjs() {
return zjcjs;
}
public String getZjwcjs() {
return zjwcjs;
}
public String getSjycs() {
return sjycs;
}
public String getSjwcjs() {
return sjwcjs;
}
public Date getRylrsj() {
return rylrsj;
}
public void setRylrsj(Date rylrsj) {
this.rylrsj = rylrsj;
}
public String getYysjstr() {
return yysjstr;
}
......
src/main/resources/templates/cjqx/sbjkglform.html
......@@ -23,7 +23,7 @@
<!--查询条件-->
<div class="xztitle">查询条件</div>
<form class="layui-form" action="" method="post" style="display: table;width: 100%;padding-top:10px;">
<input type="hidden" name="ssdwcode" id="ssdwcode" th:value="${session.User.getUnitcode()}" class="layui-input">
<!-- <input type="hidden" name="ssdwcode" id="ssdwcode" th:value="${session.User.getUnitcode()}" class="layui-input">-->
<div class="layui-form-item">
<label class="layui-form-label">IP：</label>
......@@ -31,41 +31,59 @@
<input type="text" name="ip" id="ip" lay-verify="ip" placeholder="请输入IP" autocomplete="off" class="layui-input">
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">MAC：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <input type="text" name="mac" id="mac" lay-verify="mac" placeholder="请输入MAC" autocomplete="off" class="layui-input">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">是否一体化采集机：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy">-->
<!-- <option value="">请选择</option>-->
<!-- <option value="是">是</option>-->
<!-- <option value="否">否</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">MAC：</label>
<label class="layui-form-label">隶属单位：</label>
<div class="layui-input-block">
<input type="text" name="mac" id="mac" lay-verify="mac" placeholder="请输入MAC" autocomplete="off" class="layui-input">
<input id="ssdwcode" name="ssdwcode" type="text" lay-verify="scode" style="width:66%; height:32px;" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">审批状态：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <select name="spzt" id="spzt">-->
<!-- <option value="">请选择</option>-->
<!-- <option value="0">未审批</option>-->
<!-- <option value="1">审批通过</option>-->
<!-- <option value="2">审批退回</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">设备状态：</label>-->
<!-- <div class="layui-input-block">-->
<!-- <select name="sbztstr" id="sbztstr">-->
<!-- <option value="">请选择</option>-->
<!-- <option value="启用">启用</option>-->
<!-- <option value="禁用">禁用</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">是否一体化采集机：</label>
<label class="layui-form-label">录入时间：</label>
<div class="layui-input-block">
<select name="ifythcjy" lay-filter="ifythcjy" id="ifythcjy">
<option value="">请选择</option>
<option value="是">是</option>
<option value="否">否</option>
</select>
<input id="minlrsjStr" name="minlrsjStr" type="text" class="startDate layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">审批状态：</label>
<label class="layui-form-label">至：</label>
<div class="layui-input-block">
<select name="spzt" id="spzt">
<option value="">请选择</option>
<option value="0">未审批</option>
<option value="1">审批通过</option>
<option value="2">审批退回</option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">设备状态：</label>
<div class="layui-input-block">
<select name="sbztstr" id="sbztstr">
<option value="">请选择</option>
<option value="启用">启用</option>
<option value="禁用">禁用</option>
</select>
<input id="maxlrsjStr" name="maxlrsjStr" type="text" class="endDate layui-input">
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
......@@ -128,13 +146,13 @@
{{# } }}
</script>
<script src="/static/layui/layui.js" charset="utf-8"></script>
<script src="/static/layui/layui.all.js" charset="utf-8"></script>
<script>
layui.use('table', function(){
layui.use(['table','laydate'], function(){
var date = new Date();
var table = layui.table;
var laydate = layui.laydate;
table.render({
elem: '#test'
,url:'sysClientVplist'
......@@ -146,13 +164,21 @@
,cols: [
[
// { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
{type:'numbers', title:'序号',align:'center', width:'10%'}
,{field:'ip', title:'IP地址',align:'center', width:'15%'}
,{field:'mac', title:'MAC地址',align:'center', width:'15%'}
,{field:'gxsj', title:'最后一次采集时间',align:'center', width:'15%',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'ssdwname', title:'隶属单位',align:'center', width:'15%'}
,{field:'zrmjname', title:'负责人',align:'center', width:'15%'}
,{field:'sbztstr', title:'设备状态',align:'center', width:'15%',templet: '#ifsbzt'}
{type:'numbers', title:'序号',align:'center', width:'4%'}
,{field:'ip', title:'IP地址',align:'center', width:'10%'}
// ,{field:'mac', title:'MAC地址',align:'center', width:'15%'}
// ,{field:'gxsj', title:'最后一次采集时间',align:'center', width:'15%',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'rylrsj', title:'最近更新时间',align:'center', width:'10%',templet : "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'ssdwname', title:'隶属单位',align:'center', width:'10%'}
,{field:'ycs', title:'应采数',align:'center', width:'8%'}
,{field:'zwcjs', title:'指纹采集数',align:'center', width:'8%'}
,{field:'rxcjs', title:'人像采集数',align:'center', width:'8%'}
,{field:'hmcjs', title:'虹膜采集数',align:'center', width:'8%'}
,{field:'zjcjs', title:'足迹采集数',align:'center', width:'8%'}
,{field:'swcjs', title:'声纹采集数',align:'center', width:'8%'}
,{field:'sjycs', title:'手机采集数',align:'center', width:'8%'}
,{field:'zrmjname', title:'负责人',align:'center', width:'10%'}
// ,{field:'sbztstr', title:'设备状态',align:'center',templet: '#ifsbzt', width:'5%'}
/* ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/
]
......@@ -180,6 +206,9 @@
ifythcjy:$("#ifythcjy option:selected").val(),
spzt: $("#spzt option:selected").val(),
sbztstr: $("#sbztstr option:selected").val(),
minlrsjStr: $('#minlrsjStr').val(),
maxlrsjStr: $('#maxlrsjStr').val(),
ssdwcode: $("#ssdwcode").combobox("getValue"),
cjsblxcode:'1'
}
});
......@@ -251,8 +280,39 @@
break;
}
});
/**
* 初始化时间控件
*/
function initLaydate() {
var time=new Date();
var nowDate = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate();
var y=time.getFullYear();
var m = time.getMonth();
var firstDay = new Date(y, m, 1);
var dateDom = $(".dateType");
$.each($(".startDate"), function (i, dom) {
laydate.render({
elem: dom,
type: 'date',
// range:true,
format: 'yyyy-MM-dd',
value: firstDay
});
});
$.each($(".endDate"), function (i, dom) {
laydate.render({
elem: dom,
type: 'date',
// range:true,
format: 'yyyy-MM-dd',
value: nowDate
});
});
};
$(function () {
initLaydate();
})
});
......
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