Skip to content

H
hnxtbaboot
Commit 25a551aa by wuchengwu
Options

统计，设备柱状图修改

parent 0903bab9
Showing with 171 additions and 56 deletions
src/main/java/com/founder/cjqx/controller/SysClientVpController.java
......@@ -51,6 +51,13 @@ public class SysClientVpController {
if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("1")){
sysClientVp.setSsdwcode(user.getUnitcode());
}
try {
String ip = SysUitl.getIp(request);
sysClientVp.setBaseIp(xzxtencode(ip));
// sysClientVp.setZrmjjh(user.getPolicemanid());
} catch (Exception e) {
e.printStackTrace();
}
//我的设备管理 默认查询本人采集
if(sysClientVp.getCjsblxcode()!=null&&sysClientVp.getCjsblxcode().equals("2")){
sysClientVp.setZrmjjh(user.getPolicemanid());
......
src/main/java/com/founder/controller/SystemController.java
......@@ -490,7 +490,7 @@ public class SystemController {
protected void response2Client (HttpServletResponse response, String content) {
response.setContentType("text/html;charset=UTF-8");
PrintWriter out = null;
log.info("response content -->" + content);
// log.info("response content -->" + content);
try {
out = response.getWriter();
out.print(content);
......
src/main/java/com/founder/controller/ZlccController.java
......@@ -283,7 +283,7 @@ public class ZlccController {
dataAssess.setSsdw(ssdw.substring(0, 6));
}
dataAssess.setRwkssjStr(kssjStr);
dataAssess.setJssjStr(jssjStr);
dataAssess.setRwjssjStr(jssjStr);
dataAssess.setRwbhList(idsList);
EasyUIPage easyUIPage = new EasyUIPage();
int count = afisQualityCcrwService.querySjkhPageCount(dataAssess);
......@@ -458,7 +458,7 @@ public class ZlccController {
scoreAssess.setSsdw(ssdw.substring(0, 6));
}
scoreAssess.setRwkssjStr(kssjStr);
scoreAssess.setJssjStr(jssjStr);
scoreAssess.setRwjssjStr(jssjStr);
scoreAssess.setRwbhList(idsList);
EasyUIPage easyUIPage = new EasyUIPage();
int count = afisQualityCcrwService.queryPfkhPageCount(scoreAssess);
......
src/main/java/com/founder/khtj/controller/KhtjController.java
......@@ -83,20 +83,21 @@ public class KhtjController {
}
rstBeanlist=rycjtjService.getRsts(rstBean,rccdw,ifhk);
int zycs=0;int ycs=0;int zwcjs=0;
int rxcjs=0;int swcjs=0;int zjcjs=0;
int rxcjs=0;int swcjs=0;int zjcjs=0;int sfcfs =0;
int hmcjs=0;int sjcjs=0;int dnacjs=0;
for(RstBean aj:rstBeanlist){
aj.setMaxccsjStr(rstBean.getMaxccsjStr());
aj.setMinccsjStr(rstBean.getMinccsjStr());
zycs = zycs+Integer.parseInt(aj.getZycs());
ycs=ycs+Integer.parseInt(aj.getYcs());
zwcjs=zwcjs+Integer.parseInt(aj.getZwcjs());
rxcjs=rxcjs+Integer.parseInt(aj.getRxcjs());
swcjs=swcjs+Integer.parseInt(aj.getSwcjs());
zjcjs=zjcjs+Integer.parseInt(aj.getZjcjs());
hmcjs=hmcjs+Integer.parseInt(aj.getHmcjs());
sjcjs=sjcjs+Integer.parseInt(aj.getSjcjs());
dnacjs=dnacjs+Integer.parseInt(aj.getDnacjs());
zycs +=Integer.parseInt(aj.getZycs());
ycs+=Integer.parseInt(aj.getYcs());
zwcjs+=Integer.parseInt(aj.getZwcjs());
rxcjs+=Integer.parseInt(aj.getRxcjs());
swcjs+=Integer.parseInt(aj.getSwcjs());
zjcjs+=Integer.parseInt(aj.getZjcjs());
hmcjs+=Integer.parseInt(aj.getHmcjs());
sjcjs+=Integer.parseInt(aj.getSjcjs());
dnacjs+=Integer.parseInt(aj.getDnacjs());
sfcfs += Integer.parseInt(aj.getSfcfs());
}
rstBean.setZwcjl(jscjl(zycs+"",zwcjs+""));
rstBean.setRxcjl(jscjl(zycs+"",rxcjs+""));
......@@ -114,6 +115,7 @@ public class KhtjController {
rstBean.setHmcjs(hmcjs+"");
rstBean.setDnacjs(dnacjs+"");
rstBean.setSjcjs(sjcjs+"");
rstBean.setSfcfs(sfcfs+"");
rstBean.setName("合计");
rstBean.setCode(rstBean.getRCcdw());
rstBeanlist.add(rstBean);
......
src/main/resources/mapper/KhtjDao.xml
......@@ -170,11 +170,12 @@
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
)t8,
(select nvl(sum(ry.cfs),0) as sfcfs from (
select (case when hm >1 then 1 else 0 end ) cfs from (
select count(*) as hm, ZJHM
select (case when fs > 1 then 1 else 0 end ) cfs from (
select count(*) as fs, ZJHM
from TB_RY_RYCJ
where (SCBZ = '0' or SCBZ is null)
and (ifhb is null or ifhb <![CDATA[<>]]>'1')
and zjhm is not null
<if test="lrdwdm != null and lrdwdm != ''">and lrdwdm like #{lrdwdm , jdbcType=VARCHAR }||'%'</if>
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
......
src/main/resources/mapper/SysClientVpMapper.xml
......@@ -338,12 +338,17 @@
<!-- 通过条件分页查询，返回数据集 -->
<select id="selectPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
SELECT * FROM
(
(select * from (
SELECT A.*, ROWNUM RN
FROM (SELECT * FROM Sys_Client_Vp
<include refid="queryWhere"/>) A
WHERE ROWNUM <![CDATA[ <= ]]> ${end}
<include refid="queryWhere"/>
<if test="baseIp != null and baseIp != ''">
union
SELECT * FROM Sys_Client_Vp vp WHERE vp.SCBZ = '0' AND vp.ip = #{baseIp}
</if>) A
order by decode(a.ip ,#{baseIp}, A.SPZT), A.SPZT,A.GXSJ desc
)
WHERE ROWNUM <![CDATA[ <= ]]> ${end})
WHERE RN <![CDATA[ >= ]]> ${begin}
</select>
......
src/main/resources/templates/cjqx/sbjkglform.html
......@@ -1223,7 +1223,16 @@
]
},
xAxis: { type: 'category',data:groupName },
yAxis: {},
yAxis: {
axisLabel: {
interval: 0,
rotate: 20,
}
},
grid: {
left: '20%',},
// Declare several bar series, each will be mapped
// to a column of dataset.source by default.
series: [{
......@@ -1284,7 +1293,16 @@
]
},
xAxis: { type: 'category',data:groupName },
yAxis: {},
yAxis: {
axisLabel: {
interval: 0,
rotate: 20,
}
},
grid: {
left: '20%',},
// Declare several bar series, each will be mapped
// to a column of dataset.source by default.
series: [{
......@@ -1345,7 +1363,16 @@
]
},
xAxis: { type: 'category',data:groupName },
yAxis: {},
yAxis: {
axisLabel: {
interval: 0,
rotate: 20,
}
},
grid: {
left: '20%',},
// Declare several bar series, each will be mapped
// to a column of dataset.source by default.
// series: [{ type: 'bar',data:result }]
......
src/main/resources/templates/whgl/sjwzxjc.html
......@@ -265,7 +265,7 @@
var zj=row.zj;
var rstStr;
if(zj==null||zj==""||zj<=0){
rstStr = "<span onclick='alertCjzt(\"zj\",0,\"00\")' style='font-size: 20px;font-weight: bold;' title='足迹'>0/12</span>";
rstStr = "<span onclick='alertCjzt(\"zj\",0,\"00\")' style='font-size: 20px;font-weight: bold;' title='足迹'>0/14</span>";
}else{
var rst = "";
if(zj==1){
......@@ -273,7 +273,7 @@
}else{
rst = "11";
}
rstStr = "<span onclick='alertCjzt(\"zj\","+zj+",\""+rst+"\")' style='font-size: 20px;font-weight: bold;' title='足迹'>"+zj+"/12</span>";
rstStr = "<span onclick='alertCjzt(\"zj\","+zj+",\""+rst+"\")' style='font-size: 20px;font-weight: bold;' title='足迹'>"+zj+"/14</span>";
}
return rstStr;
}},
......
src/main/resources/templates/zlcc/iframe2.html
......@@ -260,14 +260,38 @@
function doClear(){
$("form[name='sjkhrwForm']") .find("input").val('');
$("input[name='ssdw']").val("");
openCombotree('ssdw');
$("input[name='ssdw']").val($("#userunitcode").val());
$('#kssjStr').val(getRecentDay);
$('#jssjStr').val(getCruuentDay);
doQuery();
}
$(function(){
doQuery();
openCombotree('ssdw');
// $("input[name='ssdw']").val($("#userunitcode").val());
$('#kssjStr').val(getRecentDay);
$('#jssjStr').val(getCruuentDay);
$("input[name='ssdw']").val($("#userunitcode").val());
doQuery();
});
function getRecentDay() {
var today = new Date();
var tYear = today.getFullYear();
var tMonth = today.getMonth();
var tDate = today.getDate();
return tYear + "-" + tMonth + "-" + tDate ;
}
function getCruuentDay() {
var today = new Date();
var tYear = today.getFullYear();
var tMonth = today.getMonth()+1;
var tDate = today.getDate();
return tYear + "-" + tMonth + "-" + tDate ;
}
//新建弹框
function newDialog(rwbh,iffy){
if(rwbh!=null&&rwbh!=undefined&&rwbh!="undefined"){
......
src/main/resources/templates/zlcc/iframe3.html
......@@ -318,14 +318,36 @@
function doClear(){
$("form[name='pfkhrwForm']") .find("input").val('');
$("input[name='ssdw']").val("");
openCombotree('ssdw');
$("input[name='ssdw']").val($("#userunitcode").val());
$('#kssjStr').val(getRecentDay);
$('#jssjStr').val(getCruuentDay);
doQuery();
}
$(function(){
doQuery();
openCombotree('ssdw');
// $("input[name='ssdw']").val($("#userunitcode").val());
$('#kssjStr').val(getRecentDay);
$('#jssjStr').val(getCruuentDay);
$("input[name='ssdw']").val($("#userunitcode").val());
doQuery();
});
function getRecentDay() {
var today = new Date();
var tYear = today.getFullYear();
var tMonth = today.getMonth();
var tDate = today.getDate();
return tYear + "-" + tMonth + "-" + tDate ;
}
function getCruuentDay() {
var today = new Date();
var tYear = today.getFullYear();
var tMonth = today.getMonth()+1;
var tDate = today.getDate();
return tYear + "-" + tMonth + "-" + tDate ;
}
//新建弹框
function newDialog(rwbh,iffy){debugger
if(rwbh!=null&&rwbh!=undefined&&rwbh!="undefined"){
......
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