diff --git a/application/admin/controllers/StatController.php b/application/admin/controllers/StatController.php index c4bb0307..311a3903 100644 --- a/application/admin/controllers/StatController.php +++ b/application/admin/controllers/StatController.php @@ -17,11 +17,9 @@ class Admin_StatController extends Zend_Controller_Action $sql="select (select count(id) from users) as alluser, (select count(id) from normalmetadata) as alldata, (select count(id) as num from dataorder where status=0) as onlinedown, - (select count(id) as num from dataorder where status=5) as offlinedown, (select count(id) as num from dataorder where offlineappid>0 and status>4) as offlinepass, (select count(id) as num from dataorder where offlineappid>0 and status in (2,3,4)) as offlineunfinished, - (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied, - (select count(id) as num from onlineapp) as onlineapp"; + (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied"; $this->view->stat=$this->db->fetchRow($sql); //下载量统计 @@ -39,13 +37,7 @@ class Admin_StatController extends Zend_Controller_Action $res = $this->db->query($sql); $onlinesize = $res->fetch(); $this->view->onlinesize = $onlinesize; - - /*$sql="select sum(configvalue::real)/1024/1024/1024 as num from g6ftpusersettings where userid in (select id from g6ftpusers where name like 'westdc%' or name='newwestdc') and configname='StatsDownloaded'"; - $res = $this->db->query($sql); - $onlinesize = $res->fetch(); - $this->view->onlineg6size = $onlinesize; - */ - + }//indexAction 首页 function unitAction() @@ -80,7 +72,7 @@ class Admin_StatController extends Zend_Controller_Action if(!empty($y)||!is_numeric($y)) { $n = date("Y",time()); - if($y<2004 || $y>$n) + if($y<2011 || $y>$n) { $y=$n; } @@ -140,94 +132,5 @@ class Admin_StatController extends Zend_Controller_Action { }//webalizer 统计 - - function waterAction() - { - - $sql="select count(k.keyword) as num,d.status,k.keyword from dataorder d left join metadata m on d.uuid=m.uuid - left join keyword k on m.id=k.id - where (d.status=5 or d.status=-1) and m.source='0595169a-279e-4b95-819f-129d0ba4280d' - and (k.keyword='航空遥感' or k.keyword='卫星遥感' or k.keyword='气象水文' or k.keyword='上游寒区水文试验区' or k.keyword='森林水文试验区' or k.keyword='中游干旱区水文试验区') - group by k.keyword,d.status order by k.keyword desc,d.status desc"; - - $re =$this->db->query($sql); - $type =$re->fetchAll();//按分类 - - $this->view->type = $type; - - $sql="select count(extract(month from o.ts_created)) as c,extract(month from o.ts_created) as m,extract(year from o.ts_created) as y - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=3 or d.status=5 or d.status=-1) - group by extract(month from o.ts_created),extract(year from o.ts_created) - order by extract(year from o.ts_created),extract(month from o.ts_created)"; - - $re=$this->db->query($sql); - $month=$re->fetchAll(); - - $this->view->month = $month; - - $sql = "select - extract(year from o.ts_created) as y,extract(month from o.ts_created) as m, - count(extract(month from o.ts_created)) as c - from - (select distinct(o.id),o.ts_created - from offlineapp o where o.datalist like '%黑河综合遥感联合试验%') as o - group by extract(month from o.ts_created),extract(year from o.ts_created) - order by extract(year from o.ts_created),extract(month from o.ts_created)"; - - $re=$this->db->query($sql); - $order=$re->fetchAll(); - - $this->view->order = $order; - - $sql = "select (sum(m.filesize)/1024) as n from dataorder d left join metadata m on d.uuid=m.uuid - where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d'"; - - $re=$this->db->query($sql); - $num=$re->fetchAll(); - - $this->view->num=$num; - - - $sql = "select count(lower(o.unit)) as c,lower(o.unit) as u - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) - group by lower(o.unit) - order by lower(o.unit)"; - - $re=$this->db->query($sql); - $units=$re->fetchAll(); - - $this->view->units=$units; - - - $sql = "select count(t.unit) as c,t.unit from - (select distinct(o.id),o.unit - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) - ) as t - group by t.unit"; - - $re = $this->db->query($sql); - $ounit= $re->fetchAll(); - - $this->view->ounit = $ounit; - - //water 项目按月统计下载量 - $sql = "select (sum(m.filesize)/1024) as n,extract(month from d.ts_created) as m,extract(year from d.ts_created) as y from dataorder d left join metadata m on d.uuid=m.uuid - where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d' - group by extract(month from d.ts_created),extract(year from d.ts_created) - order by extract(year from d.ts_created),extract(month from d.ts_created)"; - - $re = $this->db->query($sql); - $dm = $re->fetchAll(); - - $this->view->dm = $dm; - - - }//WATER项目 - - - } diff --git a/application/admin/views/scripts/stat/awstatsweb.phtml b/application/admin/views/scripts/stat/awstatsweb.phtml index 8621a407..304bab08 100644 --- a/application/admin/views/scripts/stat/awstatsweb.phtml +++ b/application/admin/views/scripts/stat/awstatsweb.phtml @@ -8,8 +8,11 @@ $this->breadcrumb()->setSeparator(' > '); ?>
-partial('stat/left.phtml'); ?> +partial('stat/left.phtml'); ?> +
- +
\ No newline at end of file diff --git a/application/admin/views/scripts/stat/index.phtml b/application/admin/views/scripts/stat/index.phtml index 8f669f60..c63fe3a4 100644 --- a/application/admin/views/scripts/stat/index.phtml +++ b/application/admin/views/scripts/stat/index.phtml @@ -16,11 +16,9 @@
  • 用户总数：stat['alluser']; ?>人
  • 元数据条数：stat['alldata']; ?>条
  • 在线数据下载次数：stat['onlinedown']; ?>条
    • -
  • 在线数据下载次数：stat['offlinedown']; ?>条
    • -
  • 已通过的离线申请：stat['offlinepass']; ?>次
    • +
  • 离线数据下载次数：stat['offlinepass']; ?>条
  • 未完成的离线申请：stat['offlineunfinished']; ?>次
  • 被拒绝的离线申请：stat['offlinedenied']; ?>人次
    • -
  • 有记录的在线下载数：stat['onlineapp']; ?>次
    • @@ -31,22 +29,18 @@ 单位:GB - 总下载数据量（估计量，偏大） + 总下载数据量 allsize['num'],2);?> - 离线下载数据量（从09年4月） + 离线下载数据量 offlinesize['num'],2);?> - 在线下载数据量（估计量，偏大） + 在线下载数据量 onlinesize['num'],2);?> - - G6在线下载数据量（精确量） - onlineg6size['num'],2);?> - - +
    diff --git a/application/admin/views/scripts/stat/left.phtml b/application/admin/views/scripts/stat/left.phtml index a4c30776..4eb068e9 100644 --- a/application/admin/views/scripts/stat/left.phtml +++ b/application/admin/views/scripts/stat/left.phtml @@ -4,6 +4,4 @@
  • 分单位统计
  • 分月统计
  • awstats web统计
    • -
  • awstats ftp统计
    • -
  • webalizer统计
    • \ No newline at end of file diff --git a/application/admin/views/scripts/stat/month.phtml b/application/admin/views/scripts/stat/month.phtml index e8549574..da305805 100644 --- a/application/admin/views/scripts/stat/month.phtml +++ b/application/admin/views/scripts/stat/month.phtml @@ -28,15 +28,9 @@
    选择年份： - 2004 - 2005 - 2006 - 2007 - 2008 - 2009 - 2010 - 2011 - 2012 + 2012 + 2013 + 2014
    y.'年按月在线下载量统计';?>