From dbf4fbf4a038d9126bd99534c963a22cc5162d64 Mon Sep 17 00:00:00 2001
From: caoming <604844710@qq.com>
Date: Wed, 30 Oct 2019 11:12:44 +0800
Subject: [PATCH] app-ht(v1.8.6 build 12) 1.数据统计OTA升级统计功能实现 1.数据统计APP升级统计功能实现

---
 app-ht/config/main.php                                    |   7 +++++--
 app-ht/config/params.php                                  |   2 +-
 app-ht/modules/datas/Module.php                           |  14 ++++++++++++++
 app-ht/modules/datas/config/perm.php                      |  14 ++++++++++++++
 app-ht/modules/datas/controllers/UpgradeLogController.php | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app-ht/modules/datas/views/upgrade-log/export.php         |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app-ht/modules/datas/views/upgrade-log/index.php          | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app-ht/modules/manufacturer/views/manufacturer/index.php  |   2 +-
 app-ht/modules/model/views/model/index.php                |   2 +-
 app-ht/modules/production/views/production/index.php      |   2 +-
 app-ht/modules/project/views/project/index.php            |   2 +-
 app-ht/modules/upgrade/views/upgrade/index.php            |  12 +-----------
 app-ht/views/layouts/routes.php                           |   6 +++---
 domain/upgrade/UpgradeLog.php                             | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 domain/upgrade/UpgradeLogRepository.php                   | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 domain/upgrade/UpgradeLogStatus.php                       |  44 ++++++++++++++++++++++++++++++++++++++++++++
 domain/upgrade/models/UpgradeLog.php                      |  36 ++++++++++++++++++++++++++++++++++++
 17 files changed, 720 insertions(+), 21 deletions(-)
 create mode 100644 app-ht/modules/datas/Module.php
 create mode 100644 app-ht/modules/datas/config/perm.php
 create mode 100644 app-ht/modules/datas/controllers/UpgradeLogController.php
 create mode 100644 app-ht/modules/datas/views/upgrade-log/export.php
 create mode 100644 app-ht/modules/datas/views/upgrade-log/index.php
 create mode 100644 domain/upgrade/UpgradeLog.php
 create mode 100644 domain/upgrade/UpgradeLogRepository.php
 create mode 100644 domain/upgrade/UpgradeLogStatus.php
 create mode 100644 domain/upgrade/models/UpgradeLog.php

diff --git a/app-ht/config/main.php b/app-ht/config/main.php
index 1484c0f..dc07cae 100644
--- a/app-ht/config/main.php
+++ b/app-ht/config/main.php
@@ -42,11 +42,14 @@ $config = [
         ],
         'home' => [
             'class' => 'app\ht\modules\home\Module',
-        ]
-        ,
+        ],
         'production' => [
             'class' => 'app\ht\modules\production\Module',
         ]
+        ,
+        'datas' => [
+            'class' => 'app\ht\modules\datas\Module',
+        ]
     ],
     'components' => [
         'user' => [
diff --git a/app-ht/config/params.php b/app-ht/config/params.php
index 2773e12..2d23b29 100644
--- a/app-ht/config/params.php
+++ b/app-ht/config/params.php
@@ -1,4 +1,4 @@
 <?php
 return [
-    'VERSION'               => 'v1.8.6 build 11',
+    'VERSION' => 'v1.8.6 build 12',
 ];
\ No newline at end of file
diff --git a/app-ht/modules/datas/Module.php b/app-ht/modules/datas/Module.php
new file mode 100644
index 0000000..cd83321
--- /dev/null
+++ b/app-ht/modules/datas/Module.php
@@ -0,0 +1,14 @@
+<?php namespace app\ht\modules\datas;
+
+/**
+ * @author CM
+ */
+class Module extends \app\ht\modules\BaseModule
+{
+    public function init()
+    {
+        parent::init();
+
+        $this->params['perm'] = require(__DIR__ . '/config/perm.php');
+    }
+}
\ No newline at end of file
diff --git a/app-ht/modules/datas/config/perm.php b/app-ht/modules/datas/config/perm.php
new file mode 100644
index 0000000..d10bcc3
--- /dev/null
+++ b/app-ht/modules/datas/config/perm.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'label' => '数据统计',
+    'items' => [
+        'shop_city' => [
+            'label' => '数据统计',
+            'items' => [
+                2 => '数据统计',
+            ],
+            'path'  => 'datas/upgrade-log/*'
+        ],
+    ]
+];
diff --git a/app-ht/modules/datas/controllers/UpgradeLogController.php b/app-ht/modules/datas/controllers/UpgradeLogController.php
new file mode 100644
index 0000000..ede76de
--- /dev/null
+++ b/app-ht/modules/datas/controllers/UpgradeLogController.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace app\ht\modules\datas\controllers;
+
+use Yii;
+use yii\data\Pagination;
+use domain\upgrade\UpgradeLogRepository;
+use domain\upgrade\UpgradeStatus;
+use app\ht\controllers\BaseController;
+
+/**
+ * 版本日志管理
+ * Class UpgradeLogController
+ * @package app\ht\modules\upgrade\controllers
+ */
+class UpgradeLogController extends BaseController
+{
+    /**
+     * 版本日志管理
+     */
+    public function actionIndex()
+    {
+        $params = $this->dataList(1);
+        /**
+         * 渲染模板
+         */
+        return $this->render('index', $params);
+    }
+
+    /**
+     * 查询数据列表
+     */
+    protected function dataList($type = '')
+    {
+        $request     = Yii::$app->request;
+        $creatTime   = $request->get('creatTime');
+        $endTime     = $request->get('endTime');
+        $status      = $request->get('status');
+        $current_version = $request->get('current_version');
+        $target_version  = $request->get('target_version');
+        $manufacture_name = $request->get('manufacture_name');
+        $device_no   = $request->get('device_no');
+        $barcode     = $request->get('barcode');
+        $error_code  = $request->get('error_code');
+        $device_device_id = $request->get('device_device_id');
+        $dataType    = !empty($request->get('type')) ? $request->get('type') : UpgradeStatus::TYPE_APP;
+
+        $gets = [
+            'creatTime'         => $creatTime,
+            'endTime'           => $endTime,
+            'status'            => $status,
+            'current_version'   => $current_version,
+            'target_version'    => $target_version,
+            'manufacture_name'  => $manufacture_name,
+            'device_no'         => $device_no,
+            'barcode'           => $barcode,
+            'error_code'        => $error_code,
+            'device_device_id'  => $device_device_id,
+            'type'              => $dataType,
+        ];
+
+        $where = ['and'];
+        if ($creatTime) {
+            $creatTime = strtotime($creatTime);
+            $where[] = ['>=', 'ul.created_at', $creatTime];
+        }
+        if ($endTime) {
+            $endTime = strtotime($endTime) + 86400;
+            $where[] = ['<=', 'ul.created_at', $endTime];
+        }
+        if ($status) {
+            $where[] = ['=', 'ul.status', $status];
+        }
+        if ($current_version) {
+            $where[] = ['like', 'ul.current_version', $current_version];
+        }
+        if ($target_version) {
+            $where[] = ['like', 'ul.target_version', $target_version];
+        }
+        if ($manufacture_name) {
+            $where[] = ['like', 'mf.name', $manufacture_name];
+        }
+        if ($device_no) {
+            $where[] = ['like', 'md.name', $device_no];
+        }
+        if ($barcode) {
+            $where[] = ['like', 'ul.barcode', $barcode];
+        }
+        if ($error_code) {
+            $where[] = ['like', 'ul.error_code', $error_code];
+        }
+        if ($device_device_id) {
+            $where[] = ['like', 'de.device_id', $device_device_id];
+        }
+        if ($dataType) {
+            $where[] = ['=', 'ul.type', $dataType];
+        }
+        if ($type == 0) {
+            $pageList = UpgradeLogRepository::getPageList($where, 0 , 0);
+            $pages = null;
+        } else {
+            $pageSize = 20;
+            $pages = new Pagination(['totalCount' => UpgradeLogRepository::getPageCount($where), 'pageSize' => $pageSize]);
+            $pageList = UpgradeLogRepository::getPageList($where, $pages->offset, $pages->limit);
+        }
+
+        /**
+         * 数据整理
+         */
+        return [
+            'listdata'   => $pageList,
+            'pages'      => $pages,
+            'gets'       => $gets
+        ];
+    }
+
+    /**
+     * 导出版本日志数据
+     * @return string
+     */
+    public function actionExport()
+    {
+        $params = $this->dataList(0);
+        return $this->renderPartial('export', $params);
+    }
+}
\ No newline at end of file
diff --git a/app-ht/modules/datas/views/upgrade-log/export.php b/app-ht/modules/datas/views/upgrade-log/export.php
new file mode 100644
index 0000000..8639fdb
--- /dev/null
+++ b/app-ht/modules/datas/views/upgrade-log/export.php
@@ -0,0 +1,66 @@
+<?php
+
+use domain\upgrade\UpgradeLogStatus;
+
+header('Content-Type: application/vnd.ms-excel;charset=utf-8');
+$title = date('Y-m-d') . '_升级统计数据';
+$name = $title . ".xls";
+header('Content-Disposition: attachment;filename=' . $name . '');
+header('Cache-Control: max-age=0');
+$fp = fopen('php://output', 'a');
+$limit = 10000;
+$cnt = 0;
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+      xmlns:x="urn:schemas-microsoft-com:office:excel"
+      xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+    <meta http-equiv=Content-Type content="text/html; charset=utf-8">
+
+</head>
+<body>
+<div id="Classeur1_16681" align='center' x:publishsource="Excel">
+    <table border='1' cellpadding='0' cellspacing='0' width='100%' style="border-collapse: collapse">
+        <thead>
+        <tr>
+            <th width="10%">设备ID</th>
+            <th width="10%">当前版本</th>
+            <th width="10%">目标版本</th>
+            <th width="10%">厂商</th>
+            <th width="10%">机器型号</th>
+            <th width="10%">Barcode</th>
+            <th width="10%">升级状态</th>
+            <th width="15%">升级错误码</th>
+            <th width="15%">时间</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($listdata as $key => $item) : ?>
+            <tr>
+                <td style="padding:12px;"><?= (isset($item["device_device_id"]) ? $item["device_device_id"] : "") ?></td>
+                <td style="padding:12px;"><?= (isset($item["current_version"]) ? $item["current_version"] : "") ?></td>
+                <td style="padding:12px;"><?= (isset($item["target_version"]) ? $item["target_version"] : "") ?></td>
+                <td style="padding:12px;"><?= (isset($item["manufacture_name"]) ? $item["manufacture_name"] : "") ?></td>
+                <td style="padding:12px;"><?= (isset($item["model_name"]) ? $item["model_name"] : "") ?></td>
+                <td style="padding:12px;"><?= (isset($item["barcode"]) ? $item["barcode"] : "") ?></td>
+                <td style="padding:12px;"><?= UpgradeLogStatus::statusLabel($item['status'])?></td>
+                <td style="padding:12px;"><?= (isset($item["error_code"]) ? $item["error_code"] : "") ?></td>
+                <td style="padding:12px;"><?= date("Y-m-d H:i:s", $item['created_at'])?></td>
+            </tr>
+            <?php
+            $cnt++;
+            if (1000 == $cnt) { //刷新一下输出buffer，防止由于数据过多造成问题
+                ob_flush();
+                flush();
+                $cnt = 0;
+            }
+            ?>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/app-ht/modules/datas/views/upgrade-log/index.php b/app-ht/modules/datas/views/upgrade-log/index.php
new file mode 100644
index 0000000..b87524c
--- /dev/null
+++ b/app-ht/modules/datas/views/upgrade-log/index.php
@@ -0,0 +1,180 @@
+<?php
+
+use yii\helpers\Url;
+use app\ht\widgets\LinkPager;
+use domain\upgrade\UpgradeStatus;
+use domain\upgrade\UpgradeLogStatus;
+
+if (isset($gets["type"]) && UpgradeStatus::TYPE_OTA == $gets["type"]) {
+    $this->title = 'OTA升级统计';
+} else {
+    $this->title = 'APP升级统计';
+}
+$this->params['breadcrumbs'][] =  $this->title;
+?>
+<style>
+    .table > tbody > tr > td
+    {
+        border: white 0px solid;
+        border-top: solid 1px #fff;
+        border-bottom: 1px solid #fff;
+    }
+    .table{
+        margin-bottom: 0px!important;
+    }
+</style>
+<div class="panel panel-default">
+    <div class="panel-body">
+        <form action="" method="get" id="search-form" class="filter-form">
+            <table width="100%" class="table">
+                <tbody>
+                <tr >
+                    <td width="10%" class="text-right">当前版本</td>
+                    <td width="10%" class="text-left">
+                        <input type="text" class="form-control" name="current_version" style="width: 150px;" placeholder="输入当前版本" value="<?php if (!empty($gets['current_version'])){ echo $gets['current_version']; } ?>">
+                    </td>
+                    <td width="10%" class="text-right">目标版本</td>
+                    <td width="10%" class="text-left">
+                        <input type="text" class="form-control" name="target_version" style="width: 150px;" placeholder="输入目标版本" value="<?php if (!empty($gets['target_version'])){ echo $gets['target_version']; } ?>">
+                    </td>
+                    <td width="10%" class="text-right">厂商</td>
+                    <td width="10%" class="text-left">
+                        <input type="text" class="form-control" name="manufacture_name" style="width: 150px;" placeholder="输入厂商" value="<?php if (!empty($gets['manufacture_name'])){ echo $gets['manufacture_name']; } ?>">
+                    </td>
+                    <td width="10%" class="text-right">机器型号</td>
+                    <td width="30%" class="text-left">
+                        <input type="text" class="form-control" name="device_no" style="width: 290px;" placeholder="输入机器型号" value="<?php if (!empty($gets['device_no'])){ echo $gets['device_no']; } ?>">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="text-right">Barcode</td>
+                    <td class="text-left">
+                        <input type="text" class="form-control" name="barcode" style="width: 150px;" placeholder="输入Barcode" value="<?php if (!empty($gets['barcode'])){ echo $gets['barcode']; } ?>">
+                    </td>
+                    <td class="text-right">升级状态</td>
+                    <td class="text-left">
+                        <select class="form-control" style="width: 150px;" id="status" name="status">
+                            <option>全部</option>
+                            <?php foreach (UpgradeLogStatus::statusLabels() as $key => $value) { ?>
+                            <option value="<?=$key ?>" <?php if (isset($gets['status']) && $gets['status'] == $key){ echo "selected"; } ?>><?=$value ?></option>
+                            <?php } ?>
+                        </select>
+                    </td>
+                    <td class="text-right">升级错误码</td>
+                    <td class="text-left">
+                        <input type="text" class="form-control" name="error_code" style="width: 150px;" placeholder="输入升级错误码" value="<?php if (!empty($gets['error_code'])){ echo $gets['error_code']; } ?>">
+                    </td>
+                    <td class="text-right">时间</td>
+                    <td class="text-left">
+                        <div class="form-inline">
+                            <input type="date" class="form-control" style="width: 140px;" name="creatTime" placeholder="起" value="<?php if (!empty($gets['creatTime'])){ echo $gets['creatTime']; } ?>"> -
+                            <input type="date" class="form-control" style="width: 140px;" name="endTime" placeholder="止" value="<?php if (!empty($gets['endTime'])){ echo $gets['endTime']; } ?>">
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="text-right">设备ID</td>
+                    <td class="text-left">
+                        <input type="text" class="form-control" name="device_device_id" style="width: 150px;" placeholder="输入设备ID" value="<?php if (!empty($gets['device_device_id'])){ echo $gets['device_device_id']; } ?>">
+                    </td>
+                    <td class="text-right"></td>
+                    <td class="text-left"></td>
+                    <td class="text-right"></td>
+                    <td class="text-left"></td>
+                    <td class="text-right"></td>
+                    <td class="text-left"></td>
+                </tr>
+                <tr class="search">
+                    <td colspan="8"  class="text-center">
+                        <input type="hidden" name="type" value="<?= (isset($gets["type"]) ? $gets["type"] : UpgradeStatus::TYPE_APP) ?>">
+                        <button type="submit" class="btn btn-primary btncls" id="search"><i class="glyphicon glyphicon-search"></i> 查 询  </button>
+                        <a class="btn btn-default btncls" href="<?=Url::toRoute(["/datas/upgrade-log/index", "type" => (isset($gets["type"]) ? $gets["type"] : UpgradeStatus::TYPE_APP)])?>">重&nbsp;&nbsp;&nbsp;&nbsp;置</a>
+                        <a class="btn btn-default" style="float: right;" href="javascript:void(0)" id="btn-export"> 导出数据 </a>&nbsp;&nbsp;
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+</div>
+
+<div class="panel panel-default">
+    <div  class="panel-body">
+        <table class="table table-striped table-bordered"  id="brand-table">
+            <thead>
+            <tr>
+                <th width="10%">设备ID</th>
+                <th width="10%">当前版本</th>
+                <th width="10%">目标版本</th>
+                <th width="10%">厂商</th>
+                <th width="10%">机器型号</th>
+                <th width="10%">Barcode</th>
+                <th width="10%">升级状态</th>
+                <th width="15%">升级错误码</th>
+                <th width="15%">时间</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <?php if ($listdata) { ?>
+                <?php foreach ($listdata as $item) : ?>
+                    <tr>
+                        <td style="padding:12px;"><?= (isset($item["device_device_id"]) ? $item["device_device_id"] : "") ?></td>
+                        <td style="padding:12px;"><?= (isset($item["current_version"]) ? $item["current_version"] : "") ?></td>
+                        <td style="padding:12px;"><?= (isset($item["target_version"]) ? $item["target_version"] : "") ?></td>
+                        <td style="padding:12px;"><?= (isset($item["manufacture_name"]) ? $item["manufacture_name"] : "") ?></td>
+                        <td style="padding:12px;"><?= (isset($item["model_name"]) ? $item["model_name"] : "") ?></td>
+                        <td style="padding:12px;"><?= (isset($item["barcode"]) ? $item["barcode"] : "") ?></td>
+                        <td style="padding:12px;"><?= UpgradeLogStatus::statusLabel($item['status'])?></td>
+                        <td style="padding:12px;"><?= (isset($item["error_code"]) ? $item["error_code"] : "") ?></td>
+                        <td style="padding:12px;"><?= date("Y-m-d H:i:s", $item['created_at'])?></td>
+                    </tr>
+                <?php endforeach; ?>
+            <?php } else { ?>
+            <tr>
+                <td colspan="9">
+                    <center>暂无记录</center>
+                </td>
+            </tr>
+            <?php } ?>
+            </tbody>
+        </table>
+    </div>
+
+    <div class="panel-footer">
+        <div class="hqy-panel-pager">
+            <?= LinkPager::widget([
+                'pagination' => $pages,
+            ]); ?>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+</div>
+<script>
+    window.queryParams = function(params) {
+        $("#search-form").find('input[name]').each(function () {
+            var val = $(this).val();
+            var name = $(this).attr('name');
+            if(val){
+                params[name] = val;
+            }
+        });
+        return params;
+    }
+    $(document).ready(function () {
+        $('#btn-export').click(function(e){
+            var params = {};
+            window.queryParams(params);
+
+            $strQuery = "?";
+            if (params) {
+                for (var p in params) {
+                    $strQuery += p + "=" + params[p] + "&";
+                }
+            }
+            $strQuery = $strQuery.substring(0, $strQuery.length-1);
+            window.location.href = "export" + $strQuery;
+            return false;
+        })
+    });
+</script>
\ No newline at end of file
diff --git a/app-ht/modules/manufacturer/views/manufacturer/index.php b/app-ht/modules/manufacturer/views/manufacturer/index.php
index bb7dc02..c5e9d01 100644
--- a/app-ht/modules/manufacturer/views/manufacturer/index.php
+++ b/app-ht/modules/manufacturer/views/manufacturer/index.php
@@ -87,7 +87,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <?php endforeach; ?>
             <?php } else { ?>
             <tr>
-                <td colspan="8">
+                <td colspan="6">
                     <center>暂无记录</center>
                 </td>
             </tr>
diff --git a/app-ht/modules/model/views/model/index.php b/app-ht/modules/model/views/model/index.php
index 0f961a7..7efb824 100644
--- a/app-ht/modules/model/views/model/index.php
+++ b/app-ht/modules/model/views/model/index.php
@@ -81,7 +81,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <?php endforeach; ?>
             <?php } else { ?>
             <tr>
-                <td colspan="8">
+                <td colspan="4">
                     <center>暂无记录</center>
                 </td>
             </tr>
diff --git a/app-ht/modules/production/views/production/index.php b/app-ht/modules/production/views/production/index.php
index d65ede9..59c5378 100644
--- a/app-ht/modules/production/views/production/index.php
+++ b/app-ht/modules/production/views/production/index.php
@@ -82,7 +82,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <?php endforeach; ?>
             <?php } else { ?>
             <tr>
-                <td colspan="8">
+                <td colspan="4">
                     <center>暂无记录</center>
                 </td>
             </tr>
diff --git a/app-ht/modules/project/views/project/index.php b/app-ht/modules/project/views/project/index.php
index 6c917a2..c19d137 100644
--- a/app-ht/modules/project/views/project/index.php
+++ b/app-ht/modules/project/views/project/index.php
@@ -81,7 +81,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <?php endforeach; ?>
             <?php } else { ?>
             <tr>
-                <td colspan="8">
+                <td colspan="4">
                     <center>暂无记录</center>
                 </td>
             </tr>
diff --git a/app-ht/modules/upgrade/views/upgrade/index.php b/app-ht/modules/upgrade/views/upgrade/index.php
index 6dc1bbc..bb05a34 100644
--- a/app-ht/modules/upgrade/views/upgrade/index.php
+++ b/app-ht/modules/upgrade/views/upgrade/index.php
@@ -117,7 +117,7 @@ $this->params['breadcrumbs'][] =  $this->title;
                 <?php endforeach; ?>
             <?php } else { ?>
             <tr>
-                <td colspan="8">
+                <td colspan="7">
                     <center>暂无记录</center>
                 </td>
             </tr>
@@ -136,16 +136,6 @@ $this->params['breadcrumbs'][] =  $this->title;
     </div>
 </div>
 <script>
-    window.queryParams = function(params) {
-        $("#search-form").find('input[name]').each(function () {
-            var val = $(this).val();
-            var name = $(this).attr('name');
-            if(val){
-                params[name] = val;
-            }
-        });
-        return params;
-    }
     $(document).ready(function () {
         $(".btn_del").bind("click",function () {
             if (confirm("确定要删除该版本吗？")){
diff --git a/app-ht/views/layouts/routes.php b/app-ht/views/layouts/routes.php
index 567e22a..ebcb91a 100644
--- a/app-ht/views/layouts/routes.php
+++ b/app-ht/views/layouts/routes.php
@@ -1,5 +1,5 @@
 <?php
-
+use domain\upgrade\UpgradeStatus;
 return [
     [
         'path' => '/dashboard',
@@ -81,8 +81,8 @@ return [
                 'redirect' => '/datas/datas/index'
             ],
             ['label' => '序列号统计', 'path' => '/datas/datas/index'],
-            ['label' => 'OTA升级统计', 'path' => '/datas/datas/red-invoice'],
-            ['label' => 'APP升级统计', 'path' => '/datas/datas-setting/default'],
+            ['label' => 'OTA升级统计', 'path' => '/datas/upgrade-log/index?type=' . UpgradeStatus::TYPE_OTA],
+            ['label' => 'APP升级统计', 'path' => '/datas/upgrade-log/index?type=' . UpgradeStatus::TYPE_APP],
             ['label' => '机器状态统计', 'path' => '/datas/datas-setting/default'],
         ]
     ],
diff --git a/domain/upgrade/UpgradeLog.php b/domain/upgrade/UpgradeLog.php
new file mode 100644
index 0000000..e82b022
--- /dev/null
+++ b/domain/upgrade/UpgradeLog.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace domain\upgrade;
+
+use Yii;
+use domain\upgrade\models\UpgradeLog     as UpgradeLogModel;
+use Exception;
+
+/**
+ * 版本日志
+ * Class UpgradeLog
+ * @package domain\upgrade
+ */
+class UpgradeLog
+{
+    /**
+     * 创建版本日志
+     * @param $item
+     */
+    static function create($item)
+    {
+        try {
+            $upgradeLogModel = Yii::createObject(UpgradeLogModel::className());
+            if (isset($item["barcode"])) {
+                $upgradeLogModel->barcode = $item["barcode"]; // 序列号前缀
+            }
+            if (isset($item["device_id"])) {
+                $upgradeLogModel->device_id = $item["device_id"]; // 设备ID
+            }
+            if (isset($item["manufacture_id"])) {
+                $upgradeLogModel->manufacture_id = $item["manufacture_id"]; // 厂商ID
+            }
+            if (isset($item["project_id"])) {
+                $upgradeLogModel->project_id = $item["project_id"]; // 项目ID
+            }
+            if (isset($item["model_id"])) {
+                $upgradeLogModel->model_id = $item["model_id"]; // 设备型号ID
+            }
+            if (isset($item["current_version"])) {
+                $upgradeLogModel->current_version = $item["current_version"]; // 当前版本
+            }
+            if (isset($item["target_version"])) {
+                $upgradeLogModel->target_version = $item["target_version"]; // 目标版本
+            }
+            if (isset($item["status"])) {
+                $upgradeLogModel->status = $item["status"]; // 升级状态，1:下载成功，2:取消下载，3:开始升级，4:取消升级，5:升级成功
+            }
+            if (isset($item["error_code"])) {
+                $upgradeLogModel->error_code = $item["error_code"]; // 错误码
+            }
+            if (isset($item["type"])) {
+                $upgradeLogModel->type = $item["type"]; // 日志类型 1 app 2.ota整机
+            }
+
+            $saveResult = $upgradeLogModel->save();
+            return $saveResult;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * 更新版本日志
+     * @param $id
+     * @param $item
+     * @return null|static
+     */
+    static function update($id, $item)
+    {
+        $upgradeLogModel = UpgradeLogModel::findOne($id);
+        if (empty($upgradeLogModel)) {
+            return false;
+        }
+        if (isset($item["barcode"])) {
+            $upgradeLogModel->barcode = $item["barcode"]; // 序列号前缀
+        }
+        if (isset($item["device_id"])) {
+            $upgradeLogModel->device_id = $item["device_id"]; // 设备ID
+        }
+        if (isset($item["manufacture_id"])) {
+            $upgradeLogModel->manufacture_id = $item["manufacture_id"]; // 厂商ID
+        }
+        if (isset($item["project_id"])) {
+            $upgradeLogModel->project_id = $item["project_id"]; // 项目ID
+        }
+        if (isset($item["model_id"])) {
+            $upgradeLogModel->model_id = $item["model_id"]; // 设备型号ID
+        }
+        if (isset($item["current_version"])) {
+            $upgradeLogModel->current_version = $item["current_version"]; // 当前版本
+        }
+        if (isset($item["target_version"])) {
+            $upgradeLogModel->target_version = $item["target_version"]; // 目标版本
+        }
+        if (isset($item["status"])) {
+            $upgradeLogModel->status = $item["status"]; // 升级状态，1:下载成功，2:取消下载，3:开始升级，4:取消升级，5:升级成功
+        }
+        if (isset($item["error_code"])) {
+            $upgradeLogModel->error_code = $item["error_code"]; // 错误码
+        }
+        if (isset($item["type"])) {
+            $upgradeLogModel->type = $item["type"]; // 日志类型 1 app 2.ota整机
+        }
+
+
+        $resultSave = $upgradeLogModel->save();
+        return $resultSave;
+    }
+
+    /**
+     * 删除版本日志
+     * @param $id
+     * @param $item
+     * @return null|static
+     */
+    public static function delete($id)
+    {
+        $upgradeModel = UpgradeLogModel::findOne($id);
+        if (empty($upgradeModel)) {
+            return false;
+        }
+
+        return UpgradeLogModel::deleteAll(["id" => $id]);
+    }
+}
\ No newline at end of file
diff --git a/domain/upgrade/UpgradeLogRepository.php b/domain/upgrade/UpgradeLogRepository.php
new file mode 100644
index 0000000..83f8be8
--- /dev/null
+++ b/domain/upgrade/UpgradeLogRepository.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace domain\upgrade;
+
+use domain\device\models\Device                 as DeviceModel;
+use domain\manufacturer\models\Manufacturer     as ManufacturerModel;
+use domain\model\models\Model;
+use domain\project\models\Project;
+use domain\upgrade\models\UpgradeLog            as UpgradeLogModel;
+
+
+/**
+
+ * Class UpgradeLogRepository
+ * @package domain\model
+ */
+class UpgradeLogRepository
+{
+    /**
+     * 获取分页数据
+     * @param $where
+     * @param $offset
+     * @param $limit
+     * @return array|\yii\db\ActiveRecord[]
+     */
+    static function getPageList($where, $offset, $limit)
+    {
+        $upgradeFind = UpgradeLogModel::find()->alias("ul")
+                            ->select([
+                                "ul.*",
+                                "mf.name as manufacture_name",
+                                'de.serial_no',
+                                'de.device_id as device_device_id',
+                                'pj.name as project_name',
+                                'md.name as model_name',
+                            ]);
+        $upgradeFind->leftJoin(ManufacturerModel::tableName() . " mf", "mf.id = ul.manufacture_id");
+        $upgradeFind->leftJoin(DeviceModel::tableName() . " de", "de.id = ul.device_id");
+        $upgradeFind->leftJoin(Project::tableName() . " pj", "pj.id = ul.project_id");
+        $upgradeFind->leftJoin(Model::tableName() . " md", "md.id = ul.model_id");
+
+        if (!empty($where)) {
+            $upgradeFind->where($where);
+        }
+        if ($offset) {
+            $upgradeFind->offset($offset);
+        }
+        if ($limit) {
+            $upgradeFind->limit($limit);
+        }
+        $upgradeFind->orderBy("ul.id desc");
+        $upgradeFind->asArray();
+        $dataList = $upgradeFind->all();
+
+        return $dataList;
+    }
+
+    /**
+     * 列表页面分页器数量
+     * @param string $map
+     */
+    static function getPageCount($map = '')
+    {
+        $upgradeFind = UpgradeLogModel::find()->alias("ul");
+        $upgradeFind->leftJoin(ManufacturerModel::tableName() . " mf", "mf.id = ul.manufacture_id");
+        $upgradeFind->leftJoin(DeviceModel::tableName() . " de", "de.id = ul.device_id");
+        $upgradeFind->leftJoin(Project::tableName() . " pj", "pj.id = ul.project_id");
+        $upgradeFind->leftJoin(Model::tableName() . " md", "md.id = ul.model_id");
+        if (!empty($map)) {
+            $upgradeFind->where($map);
+        }
+        $pageCount = $upgradeFind->count();
+
+        return $pageCount;
+    }
+
+    /**
+     * @param $id
+     * @param bool|false $asArr
+     * @return null|static
+     */
+    static function selectOne($id, $asArr = false)
+    {
+        $model = UpgradeLogModel::findOne($id);
+        if ($asArr && $model) {
+            $model = $model->toArray();
+        }
+        return $model;
+    }
+
+    /**
+     * @param $id
+     * @param bool|false $asArr
+     * @return null|static
+     */
+    static function findOne($condition)
+    {
+        $model = UpgradeLogModel::findOne($condition);
+        return $model;
+    }
+}
\ No newline at end of file
diff --git a/domain/upgrade/UpgradeLogStatus.php b/domain/upgrade/UpgradeLogStatus.php
new file mode 100644
index 0000000..3b33eda
--- /dev/null
+++ b/domain/upgrade/UpgradeLogStatus.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace domain\upgrade;
+
+/**
+ * 版本发布状态
+ * Class UpgradeLogStatus
+ * @package domain\upgrade
+ */
+class UpgradeLogStatus
+{
+    /**
+     * 升级状态，1:下载成功，2:取消下载，3:开始升级，4:取消升级，5:升级成功
+     */
+    const STATUS_DOWNLOAD_SUCCESS    = 1; // 下载成功
+    const STATUS_CANCEL_DOWNLOAD     = 2; // 取消下载
+    const STATUS_START_UPDATE        = 3; // 开始升级
+    const STATUS_CANCEL_UPDATE       = 4; // 取消升级
+    const STATUS_UPDATE_SUCCESS      = 5; // 升级成功
+
+    /**
+     * @return array
+     */
+    public static function statusLabels()
+    {
+        return [
+            self::STATUS_DOWNLOAD_SUCCESS   => '下载成功',
+            self::STATUS_CANCEL_DOWNLOAD    => '取消下载',
+            self::STATUS_START_UPDATE       => '开始升级',
+            self::STATUS_CANCEL_UPDATE      => '取消升级',
+            self::STATUS_UPDATE_SUCCESS     => '升级成功',
+        ];
+    }
+
+    /**
+     * @param string $status
+     * @return mixed|string
+     */
+    public static function statusLabel($status = null)
+    {
+        $statusLabels = self::statusLabels();
+        return isset($statusLabels[$status]) ? $statusLabels[$status] : '';
+    }
+}
\ No newline at end of file
diff --git a/domain/upgrade/models/UpgradeLog.php b/domain/upgrade/models/UpgradeLog.php
new file mode 100644
index 0000000..8bff03b
--- /dev/null
+++ b/domain/upgrade/models/UpgradeLog.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace domain\upgrade\models;
+
+use yii\db\ActiveRecord;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * 版本日志管理
+ * Class UpgradeLog
+ * @package domain\upgrade\models
+ */
+class UpgradeLog extends ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%upgrade_log}}';
+    }
+
+    /**
+     * @return array
+     */
+    public function behaviors()
+    {
+        return [
+            'time' => [
+                'class' => TimestampBehavior::className(),
+                'createdAtAttribute' => 'created_at',
+                'updatedAtAttribute' => 'updated_at',
+            ]
+        ];
+    }
+}
\ No newline at end of file
--
libgit2 0.21.0