@@ -31,9 +31,10 @@ $this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表');
normaldecode($this->data['vars']);?>
+
$v) { ?>
-
-
+
+
@@ -51,6 +52,13 @@ _this = {};
_this.linetype = 'line';
_this.utctimezone = false;
$(function() {
+
+ $('.linetypes button').each(function(){
+ if($(this).hasClass('active'))
+ {
+ _this.linetype = $(this).val();
+ }
+ });
$('.linetypes button').click(function(e) {
_this.linetype = $(this).val();
@@ -88,7 +96,7 @@ $(function() {
week: '%Y
%m-%d',
month: '%Y-%m',
year: '%Y'
- },
+ }
},
diff --git a/application/module/Westdc/Visual/DataTableControl.php b/application/module/Westdc/Visual/DataTableControl.php
new file mode 100644
index 00000000..370b7a46
--- /dev/null
+++ b/application/module/Westdc/Visual/DataTableControl.php
@@ -0,0 +1,35 @@
+db->query($sql);
+
+ $row = $rs->fetchAll(\PDO::FETCH_COLUMN);
+ return $row;
+ }
+
+ public function readFields($tableName)
+ {
+ $sql = "select COLUMN_NAME from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='$tableName'";
+ $rs = $this->db->query($sql);
+ return $rs->fetchAll(\PDO::FETCH_COLUMN);
+ }
+
+}
\ No newline at end of file
diff --git a/application/module/Westdc/Visual/Database.php b/application/module/Westdc/Visual/Database.php
new file mode 100644
index 00000000..7626b89a
--- /dev/null
+++ b/application/module/Westdc/Visual/Database.php
@@ -0,0 +1,34 @@
+initDatabase();
+ }
+
+ public function initDatabase()
+ {
+ $config = \Zend_Registry::get('config');
+
+ $dsn = "pgsql:host={$config->visual_db->hostname};"
+ ."port={$config->visual_db->port};"
+ ."dbname={$config->visual_db->database};"
+ ."user={$config->visual_db->username};"
+ ."password={$config->visual_db->password}";
+
+ $this->db = new \PDO($dsn);
+ }
+
+}
\ No newline at end of file
diff --git a/application/module/Westdc/Visual/Record.php b/application/module/Westdc/Visual/Record.php
index c368be6d..b18d9294 100644
--- a/application/module/Westdc/Visual/Record.php
+++ b/application/module/Westdc/Visual/Record.php
@@ -1,106 +1,155 @@
-initDatabase();
-
- if(!empty($identifier))
- {
- $this->subdataset = $identifier;
- }
-
- if(!empty($uuid) && !empty($identifier))
- {
- $this->initVisual($uuid);
- }
- }
-
- public function __invoke()
- {
- return $this->getData();
- }
-
- public function initDatabase()
- {
- $config = \Zend_Registry::get('config');
-
- $dsn = "pgsql:host={$config->visual_db->hostname};"
- ."port={$config->visual_db->port};"
- ."dbname={$config->visual_db->database};"
- ."user={$config->visual_db->username};"
- ."password={$config->visual_db->password}";
-
- $this->db = new \PDO($dsn);
- }
-
- public function initVisual($uuid)
- {
- $visual = new Visual;
-
- $var_data = $visual->getVisualVars($uuid);
-
- $this->sql = $this->makeSql($var_data['data'],$this->subdataset);
-
- //echo $this->sql;exit();
- }
-
- public function getSql()
- {
- return $this->sql;
- }
-
- public function getData()
- {
- $rs = $this->db->query($this->sql);
-
- $data = [];
- while($row = $rs->fetch(\PDO::FETCH_ASSOC))
- {
-
- $row['utctime'] = $this->utcMsTime(strtotime($row['utctime']));
- //var_dump($row);
- $data[] = array(
- $row['utctime'],
- $row['value']
- );
- }
-
- return $data;
- }
-
- public function makeSql($table,$fieldValue)
- {
- $sql = "SELECT
- {$this->timeFiled} as utctime , \"$fieldValue\" as value
- FROM $table
- ORDER BY
- extract(YEAR from \"{$this->timeFiled}\") ASC,
- extract(MONTH from \"{$this->timeFiled}\") ASC,
- extract(DAY from \"{$this->timeFiled}\") ASC,
- extract(HOUR from \"{$this->timeFiled}\") ASC,
- extract(MINUTE from \"{$this->timeFiled}\") ASC,
- extract(SECOND from \"{$this->timeFiled}\") ASC
- ";
-
- return $sql;
- }
-
- public function utcMsTime($time=''){
- if(empty($time))
- return (time()+8*3600)*1000;
- else
- return $time*1000;
- }
+subdataset = $identifier;
+ }
+
+ if(!empty($uuid) && !empty($identifier))
+ {
+ $this->initVisual($uuid);
+ }
+ }
+
+ public function __invoke()
+ {
+ return $this->getData();
+ }
+
+ public function initVisual($uuid)
+ {
+ $visual = new Visual;
+
+ $var_data = $visual->getVisualVars($uuid);
+
+ if(!empty($var_data['visual_valuefilter']))
+ $this->valueFilter = (float)$var_data['visual_valuefilter'];
+
+ if($var_data['visual_timefield_model'] == 'single') {
+ $this->timeFiled = '"' . $var_data['visual_timefield'] . '"';
+ }//single
+ elseif($var_data['visual_timefield_model'] == 'multiple'){
+ $timefield_temp = "(";
+ if(!empty($var_data['visual_timefield_year']))
+ {
+ $timefield_temp .= $var_data['visual_timefield_year'] . "::character varying||";
+ }
+
+ $timefield_temp .= "'-'";
+
+ if(!empty($var_data['visual_timefield_month']))
+ {
+ $timefield_temp .= "||".$var_data['visual_timefield_month']."::character varying||";
+ }else{
+ $timefield_temp .= '1';
+ }
+
+ $timefield_temp .= "'-";
+
+ if(!empty($var_data['visual_timefield_day']))
+ {
+ $timefield_temp .= "'||".$var_data['visual_timefield_day'] . '::character varying';
+ }else{
+ $timefield_temp .= "1'";
+ }
+
+ $timefield_temp .= ")";
+
+ $timefield_temp .= "::timestamp without time zone";
+
+ $this->timeFiled = $timefield_temp;
+ }//multiple
+ elseif($var_data['visual_timefield_model'] == 'custom'){
+ $this->timeFiled = $var_data['visual_timefield_model'];
+ }//custom
+
+ //时间字段为空的bug
+ if(empty($var_data['visual_timefield_model'])){
+ $this->timeFiled = "utctime";
+ }else{
+ if($var_data['visual_timefield_model'] == 'single' && empty($var_data['visual_timefield'])){
+ $this->timeFiled = "utctime";
+ }elseif($var_data['visual_timefield_model'] == 'multiple' && empty($var_data['visual_timefield_year'])){
+ $this->timeFiled = "utctime";
+ }elseif($var_data['visual_timefield_model'] == 'custom' && empty($var_data['visual_timefield_custom'])) {
+ $this->timeFiled = "utctime";
+ }
+ }
+
+ if(isset($var_data['data']) && !empty($var_data['data']))
+ $this->sql = $this->makeSql($var_data['data'],$this->subdataset);
+ else
+ $this->sql = $this->makeSql($var_data['visual_datatable'],$this->subdataset);
+
+ //echo $this->sql;exit();
+ }
+
+ public function getSql()
+ {
+ return $this->sql;
+ }
+
+ public function getData()
+ {
+ $rs = $this->db->query($this->sql);
+
+ $data = [];
+ while($row = $rs->fetch(\PDO::FETCH_ASSOC))
+ {
+
+ $row['utctime'] = $this->utcMsTime(strtotime($row['utctime']));
+ //var_dump($row);
+ $data[] = array(
+ $row['utctime'],
+ $row['value']
+ );
+ }
+
+ return $data;
+ }
+
+ public function makeSql($table,$fieldValue)
+ {
+ $wheresql = "";
+ if(!empty($this->valueFilter))
+ {
+ $wheresql = " WHERE \"$fieldValue\"<>".$this->valueFilter .' ';
+ }
+
+ $sql = "SELECT
+ {$this->timeFiled} as utctime , \"$fieldValue\" as value
+ FROM $table as tbl
+ $wheresql
+ ORDER BY
+ extract(YEAR from {$this->timeFiled}) ASC,
+ extract(MONTH from {$this->timeFiled}) ASC,
+ extract(DAY from {$this->timeFiled}) ASC,
+ extract(HOUR from {$this->timeFiled}) ASC,
+ extract(MINUTE from {$this->timeFiled}) ASC,
+ extract(SECOND from {$this->timeFiled}) ASC
+ ";
+
+ return $sql;
+ }
+
+ public function utcMsTime($time=''){
+ if(empty($time))
+ return (time()+8*3600)*1000;
+ else
+ return ($time)*1000;
+ }
}
\ No newline at end of file
diff --git a/application/module/Westdc/Visual/VariableEncoder.php b/application/module/Westdc/Visual/VariableEncoder.php
index 986bf001..32b8bc49 100644
--- a/application/module/Westdc/Visual/VariableEncoder.php
+++ b/application/module/Westdc/Visual/VariableEncoder.php
@@ -15,25 +15,13 @@ class VariableEncoder
public function encode($vars)
{
- $arr = [];
- foreach($vars as $k=>$v)
- {
- $names = explode("|",$v);
- $arr[] = [ 'dataset' => $names[0], 'subdataset' => $names[1],'seriename' => $names[2]];
- }
- return json_encode($arr);
+ return json_encode($vars);
}
public function decode($json)
{
$arr = json_decode($json,true);
- //var_dump($arr);
- $data = [];
- foreach($arr as $k=>$v)
- {
- $data[$k] = join("|",$v);
- }
- return $data;
+ return $arr;
}
public function normaldecode($json)
