From 046634e0aaf687cc1757f4de0ea0a401902a522f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 27 May 2019 11:26:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mycht=E6=90=9C=E7=B4=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partners/controllers/index.php | 19 +++++++-- .../partners/models/mailinfo_model.php | 1 + .../partners/models/partners_model.php | 3 +- .../partners/views/index/group_app.php | 42 +++++++++++++++++++ .../partners/views/index/maildetail_app.php | 26 ++++++++++++ .../partners/views/index/mailinfo.php | 2 +- .../partners/views/index/mailinfo_app.php | 27 ++++++++++++ 7 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 webht/third_party/partners/views/index/group_app.php create mode 100644 webht/third_party/partners/views/index/maildetail_app.php create mode 100644 webht/third_party/partners/views/index/mailinfo_app.php diff --git a/webht/third_party/partners/controllers/index.php b/webht/third_party/partners/controllers/index.php index abf5a129..2e1b1d00 100644 --- a/webht/third_party/partners/controllers/index.php +++ b/webht/third_party/partners/controllers/index.php @@ -53,7 +53,11 @@ class Index extends CI_Controller $data['status']=$status; $data['list']=$this->Partners_model->get_orders($user,$status,$date1,$date2,$COLI_ID); //if ($COLI_ID!==false) { - $this->load->view('index/order_search',$data); + $grouptpl='index/order_search'; + if ($this->session->userdata('isapp')) { + $grouptpl='index/group_app'; + } + $this->load->view($grouptpl,$data); return; //} @@ -62,6 +66,7 @@ class Index extends CI_Controller $this->load->view('index/group'); $this->load->view('footer'); } + //地接与导游信息 public function guideinfo($GRI_SN='') { @@ -93,7 +98,11 @@ class Index extends CI_Controller $data=array(); $this->load->model('Mailinfo_model'); $data['mailinfo']=$this->Mailinfo_model->get_mail_info($COLI_ID); - $this->load->view('index/mailinfo', $data); + $tpl='index/mailinfo'; + if ($this->session->userdata('isapp')) { + $tpl='index/mailinfo_app'; + } + $this->load->view($tpl, $data); } //来往邮件正文内容 public function mail_detail($MAI_SN) @@ -102,7 +111,11 @@ class Index extends CI_Controller $this->load->model('Mailinfo_model'); $data['maildetail']=$this->Mailinfo_model->mail_detail($MAI_SN); $data['mailattach']=$this->Mailinfo_model->mail_attach($MAI_SN); - $this->load->view('index/maildetail', $data); + $tpl='index/maildetail'; + if ($this->session->userdata('isapp')) { + $tpl='index/maildetail_app'; + } + $this->load->view($tpl, $data); } } diff --git a/webht/third_party/partners/models/mailinfo_model.php b/webht/third_party/partners/models/mailinfo_model.php index ca8596c2..9dab7897 100644 --- a/webht/third_party/partners/models/mailinfo_model.php +++ b/webht/third_party/partners/models/mailinfo_model.php @@ -17,6 +17,7 @@ class Mailinfo_model extends CI_Model { { $sql="SELECT MAI_SN, MAI_SendDate, + MOI_ReadState, MAI_COLI_SN, MAI_From, MAI_To, diff --git a/webht/third_party/partners/models/partners_model.php b/webht/third_party/partners/models/partners_model.php index 3cad3b63..7ac8a80f 100644 --- a/webht/third_party/partners/models/partners_model.php +++ b/webht/third_party/partners/models/partners_model.php @@ -90,7 +90,8 @@ class Partners_model extends CI_Model { } $ApplyDate_sql=''; if ($date1) { - $ApplyDate_sql=" AND COLI_ApplyDate Between '$date1' AND '$date2' "; + //$ApplyDate_sql=" AND COLI_ApplyDate Between '$date1' AND '$date2' "; + $ApplyDate_sql=" AND COLI_OrderStartDate Between '$date1' AND '$date2' ORDER BY COLI_OrderStartDate ASC"; }elseif(!$date1 && $status==5) { $default_date=date("Y-m-d",strtotime("-15 day")); $ApplyDate_sql=" AND COLI_OrderStartDate>'$default_date' ORDER BY COLI_OrderStartDate ASC"; diff --git a/webht/third_party/partners/views/index/group_app.php b/webht/third_party/partners/views/index/group_app.php new file mode 100644 index 00000000..f0346a7e --- /dev/null +++ b/webht/third_party/partners/views/index/group_app.php @@ -0,0 +1,42 @@ + $g) { ?> +
+
+
+

订单号: COLI_ID; ?>

+

订单类型：COLI_OrderType;?>

+

报价名称：PTI_Name;?>

+

订单人数：COLI_PersonNum;?>

+

预订天数：COLI_Days;?>，出发日期是COLI_OrderStartDate;?>

+

订单来源于COLI_OrderSource;?>，提交日期是COLI_ApplyDate;?>

+
+
+
+ 客人信息 + 团信息 + 地接导游 + 来往邮件 + SFI_FileName)){ ?> + 确认信 + +
+
+
+ + + + + \ No newline at end of file diff --git a/webht/third_party/partners/views/index/maildetail_app.php b/webht/third_party/partners/views/index/maildetail_app.php new file mode 100644 index 00000000..71766d46 --- /dev/null +++ b/webht/third_party/partners/views/index/maildetail_app.php @@ -0,0 +1,26 @@ + + + + + + + 邮件正文 + + + + + + + +
+

MAI_Subject; ?>

+

发送时间: MAI_SendDate; ?>

+ MAI_BlobContent; ?> +
+ + \ No newline at end of file diff --git a/webht/third_party/partners/views/index/mailinfo.php b/webht/third_party/partners/views/index/mailinfo.php index 84fc9b2b..33c701a4 100644 --- a/webht/third_party/partners/views/index/mailinfo.php +++ b/webht/third_party/partners/views/index/mailinfo.php @@ -12,7 +12,7 @@
-

MAI_From); ?> MAI_SendDate; ?>

+

MAI_Direction==2 && $v->MOI_ReadState==0)echo '•'; ?>MAI_From); ?> MAI_SendDate; ?>

MAI_Subject; ?>

 diff --git a/webht/third_party/partners/views/index/mailinfo_app.php b/webht/third_party/partners/views/index/mailinfo_app.php new file mode 100644 index 00000000..50f316fe --- /dev/null +++ b/webht/third_party/partners/views/index/mailinfo_app.php @@ -0,0 +1,27 @@ + + + + + + + 来往邮件 + + + + + + + + +
+ + +

MAI_Direction==2 && $v->MOI_ReadState==0)echo '•'; ?>MAI_From); ?> MAI_SendDate; ?>

+

MAI_Subject; ?>

+ + +
+ + \ No newline at end of file From 9322a9fdb1c1b6abee78f89cbc3cf1719de460b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 27 May 2019 11:42:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=BC=80=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/controllers/onlineoffice.php | 95 +++++++++++++++++++ webht/views/index/index.php | 7 +- webht/views/index/search.php | 142 ++++++++++++++++------------ webht/views/onlineoffice/wakeup.php | 56 +++++++++++ webht/views/verify.php | 3 +- 5 files changed, 236 insertions(+), 67 deletions(-) create mode 100644 webht/controllers/onlineoffice.php create mode 100644 webht/views/onlineoffice/wakeup.php diff --git a/webht/controllers/onlineoffice.php b/webht/controllers/onlineoffice.php new file mode 100644 index 00000000..0d8b9d97 --- /dev/null +++ b/webht/controllers/onlineoffice.php @@ -0,0 +1,95 @@ +output->enable_profiler(TRUE); + $this->permission->is_admin(true); + $this->load->model('Navigation_model'); + $this->load->model('Operator_model'); + $this->admin_data=$this->session->userdata('admin_chtcdn'); + $this->uid=$this->admin_data['OPI_SN']; + } + + public function index() + { + $data['mid']=$this->uid; + $this->load->view('n-header', $data); + $user_data=$this->Operator_model->get_webhtuser_by_id($this->admin_data['whu_uid']); + $data['whu_ip']=$user_data->whu_ip; + $data['whu_mac']=$user_data->whu_mac; + $this->load->view('onlineoffice/wakeup',$data); + $this->load->view('n-footer'); + } + + + public function wakeonlan($ip,$mac,$port=7){ + //需要在system32目录下放置wolcmd.exe来启动 + $mac=str_replace(':','',$mac); + $last_line = system("wolcmd $mac $ip 255.255.255.0 7", $retval); + echo $last_line; + + return true; + + $addr_byte = explode(':', $mac); + $hw_addr = ''; + for ($i=0; $i <6; $i++){ + $hw_addr .= chr(hexdec($addr_byte[$i])); + } + $msg = chr(255).chr(255).chr(255).chr(255).chr(255).chr(255); + for ($i = 1; $i <= 16; $i++) { + $msg .= $hw_addr; +} + $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); + if ($socket == false) { + echo "create socket failed!\n"; + echo "error：'".socket_last_error($socket)."' - " . socket_strerror(socket_last_error($socket)); + return FALSE; + } else { + $opt_ret = socket_set_option($socket,SOL_SOCKET, SO_BROADCAST, TRUE); + if($opt_ret <0) { + echo "setsockopt() failed, error: " . strerror($opt_ret) . "\n"; + return FALSE; + } + + if(socket_sendto($socket, $msg, strlen($msg), 0, $ip, $port)) { + echo "唤醒数据包发送成功!"; + socket_close($socket); + return TRUE; + } else { + echo "唤醒数据包发送失败!"; + return FALSE; + } + } + } + + //检查端口是否打开，用来判断电脑是否启动成功 + public function ping($ip,$port=3389) { + $sock = socket_create(AF_INET, SOCK_STREAM, SOL_TCP); + socket_set_nonblock($sock); + @socket_connect($sock,$ip, $port); + socket_set_block($sock); + //返回值说明:2关闭,1打开,0超时 + switch(socket_select($r = array($sock), $w = array($sock), $f = array($sock), 5)){ + case 0: + echo '努力启动中...'; + break; + case 1: + echo '电脑启动成功！'; + break; + case 2: + echo '电脑启动成功，远程端口未打开，联系YCC开启权限'; + break; + } + } + + +} \ No newline at end of file diff --git a/webht/views/index/index.php b/webht/views/index/index.php index e7d9c90a..4f6171ba 100644 --- a/webht/views/index/index.php +++ b/webht/views/index/index.php @@ -1,11 +1,11 @@
- @@ -107,7 +107,6 @@
- + +
+

在线开机

+
+
+
+
+
+ + +
+
+ + +
+ + +
+
+
+
    + +
+
+
+ + +
+ + +
\ No newline at end of file diff --git a/webht/views/verify.php b/webht/views/verify.php index 45897e97..caab44da 100644 --- a/webht/views/verify.php +++ b/webht/views/verify.php @@ -13,12 +13,13 @@
- +
+
From e8a6594d7653d968b28941531ce54eae69e5ec94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 27 May 2019 11:45:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=BC=80=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/models/operator_model.php | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/webht/models/operator_model.php b/webht/models/operator_model.php index 720d19f0..0a71edca 100644 --- a/webht/models/operator_model.php +++ b/webht/models/operator_model.php @@ -161,6 +161,29 @@ class Operator_model extends CI_Model } return $result; } + + public function get_webhtuser_by_id($whu_uid){ + $sql=" + SELECT TOP 1 wu.whu_uid, + wu.whu_uname, + wu.whu_email, + wu.whu_ip, + wu.whu_mac, + wu.whu_status, + wu.whu_isadmin, + wu.department + FROM webht_user wu + WHERE wu.whu_uid = ? + "; + $query = $this->HT->query($sql,array($whu_uid)); + if ($query->num_rows() > 0) + { + $row = $query->row(); + return $row; + }else{ + return false; + } + } public function get_webhtuser_by_name($whu_uname,$filed='whu_uid',$flag=false) { @@ -178,6 +201,7 @@ class Operator_model extends CI_Model $result=$result[0]->$filed; } } + //print_r($this->HT->queries); return $result; } @@ -188,7 +212,8 @@ class Operator_model extends CI_Model { return false; } - + //echo $OPI_Name; + $sql = "SELECT TOP $top oi.OPI_SN, \n" . " oi.OPI_Name, \n" . " oi.OPI_Email,OPI_MoveTelephone,OPI_Telephone, \n"