Skip to content

H
hnxtbaboot
Commit 71af53d0 by wuchengwu
Options

设备状态监控管理页面添加采集数等

parent b9afd85c
Showing with 106 additions and 40 deletions
src/main/java/com/founder/cjqx/service/impl/SysClientVpServiceImpl.java
......@@ -12,8 +12,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
import java.util.*;
import static com.cc.utls.Base64Util.xzxtdecode;
import static com.cc.utls.Base64Util.xzxtencode;
......@@ -59,24 +58,43 @@ public class SysClientVpServiceImpl implements SysClientVpService {
@Override
public ResultMap ClientVpZtjk(SysClientVp SysClientVp) {
int count = sysClientVpMapper.selectsbztPageCount(SysClientVp);
if("sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())) {
SysClientVp.setBegin(0);
SysClientVp.setEnd(count);
SysClientVp.setLimit(count);
}
List<SysClientVp> sysClientVplist = sysClientVpMapper.selectsbztPageList(SysClientVp);
List<SysClientVp> resultList = new ArrayList<>();
ResultMap resultMap = new ResultMap();
for (SysClientVp sysClient : sysClientVplist) {
Date date = new Date();
if (sysClient.getRylrsj() != null) {
int days = DateUtil.differentDaysByMillisecond(sysClient.getRylrsj(), date);
if (days <= 7) {
if (days < 7) {
sysClient.setSbztstr("启用");
sysClient.setSpzt("1");
}else {
sysClient.setSbztstr("禁用");
sysClient.setSpzt("0");
}
}else {
sysClient.setSbztstr("禁用");
}
if("禁用".equals(sysClient.getSbztstr()) && "sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())){
resultList.add(sysClient);
}
}
if("sbztstr".equals(SysClientVp.getField()) && "desc".equals(SysClientVp.getOrder())) {
int totals = resultList.size();
resultMap.setCount(totals);
resultMap.setData(resultList);
}else {
int totals = count;
resultMap.setCount(totals);
resultMap.setData(sysClientVplist);
}
int totals = sysClientVpMapper.selectsbztPageCount(SysClientVp);
resultMap.setCount(totals);
resultMap.setData(sysClientVplist);
return resultMap;
}
......
src/main/java/com/founder/model/SysClientVp.java
......@@ -127,8 +127,29 @@ public class SysClientVp extends PageBean{
private String yysjstr;
private int yycsstr;
private String field;
private String order;
public void setField(String field) {
this.field = field;
}
public void setOrder(String order) {
this.order = order;
}
public String getField() {
return field;
}
public String getOrder() {
return order;
}
public Date getRylrsj() {
return rylrsj;
}
......
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -138,40 +138,47 @@
<!-- 通过设备状态监控管理查询 -->
<select id="selectsbztPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
SELECT * FROM
(
select t.ycs as ZWCJY_NAME,
SELECT *
FROM (select a.*,ROWNUM as rn
from (select t.ycs as ZWCJY_NAME,
t.rylrsj,
(select name from SYS_DICTITEM where code = t.LRDWDM and GROUPID = 'CODE_UNIT') as SSDW_NAME,
(select TRUE_NAME from SYS_USER where USERNAME = ry.LRR) as IFYTHCJY,
ROWNUM as rn
from (
select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
(select name from SYS_DICTITEM where code = t.LRDWDM and GROUPID = 'CODE_UNIT') as SSDW_NAME,
(select TRUE_NAME from SYS_USER where USERNAME = ry.LRR) as IFYTHCJY
from (select LRDWDM, count(*) as ycs, max(LRSJ) as rylrsj
from tb_ry_rycj
where scbz = '0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'%'
</if>
group by LRDWDM) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 7
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 30
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 120
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 180
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
</if>
group by LRDWDM
order by rylrsj desc
) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
and ROWNUM <![CDATA[ <= ]]> ${end}
order by rylrsj desc) a
where ROWNUM <![CDATA[ <= ]]> ${end}
)
WHERE RN <![CDATA[ >= ]]> ${begin}
</select>
......@@ -189,25 +196,34 @@
from tb_ry_rycj
where scbz = '0'
<if test="ssdwcode!=null and ssdwcode !=''">
and LRDWDM like #{ssdwcode}||'*%'
and LRDWDM like #{ssdwcode}||'%'
</if>
group by LRDWDM
) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
<if test="sbztstr!=null and sbztstr==1">
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="sbztstr!=null and sbztstr==2">
AND t.rylrsj <![CDATA[ < ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==1">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 7
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 7
</if>
<if test="gxsjStr!=null and gxsjStr==2">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 30
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 30
</if>
<if test="gxsjStr!=null and gxsjStr==3">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 120
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 120
</if>
<if test="gxsjStr!=null and gxsjStr==4">
AND lrsj <![CDATA[ >= ]]> SYSDATE - 180
AND t.rylrsj <![CDATA[ >= ]]> SYSDATE - 180
</if>
group by LRDWDM
) t,
TB_RY_RYCJ ry
where t.LRDWDM = ry.LRDWDM(+)
and t.rylrsj = ry.LRSJ
)
</select>
<!-- 通过条件分页查询，返回数据集 -->
......
src/main/resources/templates/cjqx/sbztjkform.html
......@@ -36,7 +36,7 @@
<div class="layui-form-item">
<label class="layui-form-label">采集单位：</label>
<div class="layui-input-block">
<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_QGUNIT',method:'get',textField : 'text', valueField : 'id'"/>
<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'"/>
<!-- <input type="hidden" id="ssdwname" name="ssdwname" th:value="${session.User.getUnitname()}" />-->
</div>
<input type="hidden" id="ssdwcodeStr" name="ssdwcodeStr" />
......@@ -69,6 +69,17 @@
</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="1">on</option>
<option value="2">off</option>
<!-- <option value="4" th:selected="true">半年</option>-->
</select>
</div>
</div>
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn layui-btn-normal" onclick="return false;" data-type="reload" id="selectbyCondition" >查 询</button>
......@@ -161,12 +172,12 @@
// { field:'spzt',fixed: 'left',title:'操作',align:'center', width:'10%',toolbar: '#toolbarDemo'}
{type:'numbers', title:'序号',align:'center'}
,{field:'ssdwname', title:'采集单位',align:'center'}
,{field:'rylrsj', title:'最近操作时间',align:'center',sort: true,templet : "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'rylrsj', title:'最近操作时间',align:'center',templet : "<div>{{layui.util.toDateString(d.rylrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'ifythcjy', title:'最近操作人',align:'center'}
,{field:'zwcjyname', title:'采集数',align:'center'}
// ,{field:'ip', title:'IP地址',align:'center', width:'15%'}
,{field:'sbztstr', title:'最近使用状态',align:'center',templet: '#ifsbzt',sort: true}
,{field:'sbztstr', title:'最近使用状态',align:'center',templet: '#ifsbzt'}
// ,{field:'spzt', title:'审批状态',align:'center', width:'15%',templet: '#ifspzt'}
/* ,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo', width:140}
,{field: 'right', title:'操作',align:'center', toolbar: '#barDemo4', width:140}*/
......@@ -194,7 +205,7 @@
ssdwcode: $("#ssdwcode").combobox("getValue"),
// ip: $('#ip').val(),
// sbztstr:$("#sbztstr option:selected").val(),
// spzt: $("#spzt option:selected").val(),
sbztstr: $("#sbztstr option:selected").val(),
gxsjStr: $("#gxsjStr option:selected").val(),
cjsblxcode:'1'
}
......
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