1. F 序列号管理更正

xu
1 parent 4df7fbdd
Showing 8 changed files with 98 additions and 28 deletions Show diff stats
app-api/controllers/AuthDeviceController.php
app-ht/modules/datas/views/device/device-list.php
app-ht/modules/datas/views/device/index.php
app-ht/modules/device/controllers/DeviceController.php
app-ht/modules/device/views/device/auth-fail-index.php
app-ht/modules/device/views/device/delete-index.php
app-ht/modules/device/views/device/index.php
domain/device/Device.php
@@ -73,7 +73,8 @@ class AuthDeviceController extends BaseController
            return $e;
        }
        // 检测是否授权过了的设备
-       $deviceModel = DeviceRepository::findOne(['device_id' => $deviceId]);
+       // 这里还得判读删除之后恢复的，状态是未授权
+       $deviceModel = DeviceRepository::findOne(['device_id' => $deviceId, 'is_delete' => 0]);
        if ($deviceModel && DeviceStatus::HAS_AUTH == $deviceModel->status) {
            $e->mac = $deviceModel->mac;
            $e->serial_no = $deviceModel->serial_no;
@@ -43,7 +43,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             </div>
             <div class="form-group col-sm-12">
-
                 <label for="apply_at" class="col-sm-1 control-label text-right">申请时间：</label>
                 <div class="col-sm-4 form-inline">
                     <input type="date" class="form-control" style="width:140px" id="start_apply_at" name="start_apply_at" value="<?php if (!empty($gets['start_apply_at'])){ echo $gets['start_apply_at'];} ?>" autocomplete="off"> -
@@ -62,7 +61,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
     </div>
 </div>
 <div class="panel" style="margin-bottom: 0">
-    <div style="padding:10px ;20px;box-sizing: border-box">><b>厂商：</b><?=$gets['manufacture']?>    <b>项目：</b><?=$gets['manufacture']?> <b>型号：</b><?=$gets['model']?> <b>生产日期：</b><?=$gets['production']?>
+    <div style="padding:10px ;20px;box-sizing: border-box">><b>厂商：</b><?=$gets['manufacture']?>    <b>项目：</b><?=$gets['project']?> <b>型号：</b><?=$gets['model']?> <b>生产日期：</b><?=$gets['production']?>
      <b> 批次编号：</b><?=$gets['batch_no']?>
     </div>
 </div>
@@ -70,8 +70,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                 <th width="10%">生产日期</th>
                 <th width="10%">生成总数</th>
                 <th width="8%">删除数</th>
-                <th width="10%">授权总数</th>
-                <th width="15%">授权失败数</th>
+                <th width="8%">授权总数</th>
+                <th width="8%">超出总数</th>
+                <th width="8%">授权失败数</th>
                 <th width="15%">未授权数</th>
             </tr>
             </thead>
@@ -88,6 +89,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                         <td style="padding:12px;"><a href="<?=Url::toRoute(['device/device-list','batch_id' => $item['id']])?>"><?= (isset($item["num"]) ? $item["num"] : "0") ?></a></td>
                         <td style="padding:12px;"><?= (isset($item["del_num"]) ? $item["del_num"] : "0") ?></td>
                         <td style="padding:12px;"><?= (isset($item["has_auth_num"]) ? $item["has_auth_num"] : "0") ?></td>
+                        <td>4</td>
                         <td style="padding:12px;"><?= (!empty($item["auth_fail_num"]) ? $item["auth_fail_num"] : "0") ?></td>
                         <td style="padding:12px;"><?= (!empty($item["no_auth_num"]) ? $item["no_auth_num"] : "0") ?></td>
                     </tr>
@@ -43,6 +43,8 @@ class DeviceController extends BaseController
         $startAuthAt = $request->get('start_auth_at');
         $endAuthAt = $request->get('end_auth_at');
+        $has_re_auth = $request->get('has_re_auth');
+
         $page = $request->get('page');
         $where = [
             'and',
@@ -81,6 +83,9 @@ class DeviceController extends BaseController
         if ($endAuthAt) {
             $where[] = ['>=', 'a.auth_at', strtotime($endAuthAt) + 86400];
         }
+        if ($has_re_auth) {
+            $where[] = ['=', 'a.has_re_auth', $has_re_auth];
+        }
         if (isset($_GET['status']) && -1 != $status) {
             $where[] = ['=', 'a.status', $status];
         } else {
@@ -112,6 +117,7 @@ class DeviceController extends BaseController
             'end_apply_at' => $endApplyAt,
             'start_auth_at' => $startAuthAt,
             'end_auth_at' => $endAuthAt,
+            'has_re_auth' => $has_re_auth,
             'status'      => $status
         ];
@@ -174,7 +180,7 @@ class DeviceController extends BaseController
             $where[] = ['>=', 'a.auth_at', strtotime($startAuthAt)];
         }
         if ($endAuthAt) {
-            $where[] = ['>=', 'a.auth_at', strtotime($endAuthAt) + 86400];
+            $where[] = ['<=', 'a.auth_at', strtotime($endAuthAt) + 86400];
         }
         if (isset($_GET['status']) && -1 != $status) {
             $where[] = ['=', 'a.status', $status];
@@ -637,6 +643,23 @@ class DeviceController extends BaseController
         }
     }
+    /**
+     * 恢复删除的设备
+     * @return string
+     */
+    public function actionRestoreDevice()
+    {
+        $req = Yii::$app->request;
+        $id = $req->post('id');
+        $e = new stdClass();
+        $e->success = false;
+        $e->message = 'fail';
+        $delDevice = DeviceRepository::findOne(['id' => $id, 'is_delete' => 1]);
+
+
+        return $this->renderJson($e);
+    }
+
     public function actionBatchIndex()
     {
@@ -42,7 +42,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                 <label for="apply_at" class="col-sm-1 control-label text-right">申请时间：</label>
                 <div class="col-sm-5 form-inline">
-                    <input type="text" class="form-control" id="start_apply_at" name="start_apply_at" value="<?php if (!empty($gets['start_apply_at'])){ echo $gets['start_apply_at'];} ?>" autocomplete="off"> - <input type="text" class="form-control" id="end_apply_at" name="end_apply_at" value="<?php if (!empty($gets['end_apply_at'])){ echo $gets['end_apply_at'];} ?>" autocomplete="off">
+                    <input type="date" class="form-control" id="start_apply_at" name="start_apply_at" value="<?php if (!empty($gets['start_apply_at'])){ echo $gets['start_apply_at'];} ?>" autocomplete="off"> - <input type="date" class="form-control" id="end_apply_at" name="end_apply_at" value="<?php if (!empty($gets['end_apply_at'])){ echo $gets['end_apply_at'];} ?>" autocomplete="off">
                 </div>
             </div>
@@ -59,8 +59,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
         <table class="table table-striped table-bordered"  id="brand-table">
             <thead>
             <tr>
-                <th width="5%"><input type="checkbox" value="all"  class="all_check"/></th>
-                <th width="6%">ID</th>
+                <th width="4%"></th>
+                <th width="5%">ID</th>
                 <th width="15%">厂商</th>
                 <th width="6%">项目</th>
                 <th width="8%">设备型号</th>
@@ -102,7 +102,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                         <td class="td-cls">
                             <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button> &nbsp;|&nbsp;
-                           <button class="btn btn-primary btn-sm btn_re_auth" aid="<?=$item['id'] ?>">授权</button>
+                           <button class="btn btn-primary btn-sm btn_re_auth" aid="<?=$item['id'] ?>">处理</button>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -115,6 +115,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <?php } ?>
             </tbody>
         </table>
+        <div class="action-box">
+            <label><input type="checkbox" class="check-all" value="all" /> 本页全选 </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量处理</button>
+        </div>
     </div>
     <div class="panel-footer">
@@ -82,15 +82,16 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <li ><a style="padding: 10px 20px;" href="<?=Url::toRoute('/device/device/index')?>" >全部序列号</a></li>
             <li class="active" ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >删除序列号</a></li>
         </ul>
-    </div>
+
         <table class="table table-striped table-bordered"  id="brand-table">
             <thead>
             <tr>
+                <th >ID</th>
                 <th width="6%">ID</th>
                 <th width="6%">序列号</th>
                 <th width="8%">厂商</th>
                 <th width="6%">项目</th>
-                <th width="8%">设备型号</th>
+                <th width="7%">设备型号</th>
                 <th width="6%">生产日期</th>
                 <th>MAC地址</th>
                 <th width="7%">设备ID</th>
@@ -105,6 +106,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <?php if ($deviceList) { ?>
                 <?php foreach ($deviceList as $item) : ?>
                     <tr>
+                        <td><input type="checkbox" class="check-cls check-item" value="<?= $item['id'] ?>"/></td>
                         <td class="td-cls">
                             <?= $item['id'] ?>
                         </td>
@@ -139,7 +141,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                             <?= $statusList[$item['status']] ?>
                         </td>
                         <td class="td-cls">
-                            <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button>
+                            <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button> &nbsp;|&nbsp;
+                            <button class="btn btn-warning btn-sm btn_restore" aid="<?=$item['id'] ?>">恢复</button>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -152,6 +155,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <?php } ?>
             </tbody>
         </table>
+        <div class="action-box">
+            <label><input type="checkbox" class="check-all" value="all" /> 本页全选 </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量恢复</button>
+        </div>
     </div>
     <div class="panel-footer">
@@ -167,6 +173,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
 <script>
     var authURL = "<?=Url::toRoute('/device/device/auth-device')?>";
     var delURL = "<?=Url::toRoute('/device/device/del-device')?>";
+    var restoreURL = "<?=Url::toRoute('/device/device/restore-device')?>";
     var doEditURL = "<?=Url::toRoute('/device/device/do-edit')?>";
     $(function () {
@@ -216,6 +223,10 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
         })
+        $('.btn_restore').click(function(){
+
+        })
+
     });
 </script>
 \ No newline at end of file
@@ -48,13 +48,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                 <div class="col-sm-2 form-inline">
                     <input type="text" class="form-control" id="manufacture" name="manufacture" value="<?php if (!empty($gets['manufacture'])){ echo $gets['manufacture'];} ?>" autocomplete="off">
                 </div>
-                <label for="apply_at" class="col-sm-1 control-label text-right">申请时间：</label>
-                <div class="col-sm-5 form-inline">
-                    <input type="date" class="form-control" id="start_apply_at" name="start_apply_at" value="<?php if (!empty($gets['start_apply_at'])){ echo $gets['start_apply_at'];} ?>" autocomplete="off"> - <input type="date" class="form-control" id="end_apply_at" name="end_apply_at" value="<?php if (!empty($gets['end_apply_at'])){ echo $gets['end_apply_at'];} ?>" autocomplete="off">
-                </div>
-            </div>
-
-            <div class="form-group col-sm-12">
                 <label for="mac" class="col-sm-1 control-label text-right">MAC地址：</label>
                 <div class="col-sm-2 form-inline">
                     <input type="text" class="form-control" id="mac" name="mac" value="<?php if (!empty($gets['mac'])){ echo $gets['mac'];} ?>" autocomplete="off">
@@ -63,10 +56,26 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                 <div class="col-sm-2 form-inline">
                     <input type="text" class="form-control" id="device_id" name="device_id" value="<?php if (!empty($gets['device_id'])){ echo $gets['device_id'];} ?>" autocomplete="off">
                 </div>
+            </div>
+            <div class="form-group col-sm-12">
+                <label for="apply_at" class="col-sm-1 control-label text-right">申请时间：</label>
+                <div class="col-sm-4 form-inline">
+                    <input type="date" class="form-control" id="start_apply_at" name="start_apply_at" value="<?php if (!empty($gets['start_apply_at'])){ echo $gets['start_apply_at'];} ?>" autocomplete="off"> - <input type="date" class="form-control" id="end_apply_at" name="end_apply_at" value="<?php if (!empty($gets['end_apply_at'])){ echo $gets['end_apply_at'];} ?>" autocomplete="off">
+                </div>
                 <label for="auth_at" class="col-sm-1 control-label text-right">授权时间：</label>
-                <div class="col-sm-5 form-inline">
+                <div class="col-sm-4 form-inline">
                     <input type="date" class="form-control" id="start_auth_at" name="start_auth_at" value="<?php if (!empty($gets['start_auth_at'])){ echo $gets['start_auth_at'];} ?>" autocomplete="off"> - <input type="date" class="form-control" id="end_auth_at" name="end_auth_at" value="<?php if (!empty($gets['end_auth_at'])){ echo $gets['end_auth_at'];} ?>" autocomplete="off">
                 </div>
+
+
+                <label for="auth_at" class="col-sm-1 control-label text-right">处理：</label>
+                <div class="col-sm-1 form-inline">
+                   <select name="has_re_auth" class="form-control">
+                       <option value="">全部</option>
+                       <option value="1" <?php if(1 ==$gets['has_re_auth']) {echo "selected";}?>>已处理</option>
+                       <option value="2" <?php if(2 ==$gets['has_re_auth']) {echo "selected";}?>>未处理</option>
+                   </select>
+                </div>
             </div>
             <div class="form-group col-sm-12" style="text-align: center;">
@@ -82,12 +91,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <li class="active" ><a style="padding: 10px 20px;" href="<?=Url::toRoute('/device/device/index')?>" >全部序列号</a></li>
             <li ><a style="padding: 10px 12px;" href="<?=Url::toRoute('/device/device/delete-index')?>" >删除序列号</a></li>
         </ul>
-    </div>
+
         <table class="table table-striped table-bordered"  id="brand-table">
             <thead>
             <tr>
+                <th></th>
                 <th width="6%">ID</th>
-                <th width="6%">序列号</th>
+                <th width="5%">序列号</th>
                 <th width="8%">厂商</th>
                 <th width="6%">项目</th>
                 <th width="8%">设备型号</th>
@@ -105,6 +115,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <?php if ($deviceList) { ?>
                 <?php foreach ($deviceList as $item) : ?>
                     <tr>
+                        <td><input type="checkbox" class="check-cls check-item" value="<?= $item['id'] ?>"/></td>
                         <td class="td-cls">
                             <?= $item['id'] ?>
                         </td>
@@ -139,9 +150,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                             <?= $statusList[$item['status']] ?>
                         </td>
                         <td class="td-cls">
-                            <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button> &nbsp;|&nbsp;
-                           <?php if(DeviceStatus::HAS_AUTH != $item['status']){?> <button class="btn btn-primary btn-sm btn_auth" aid="<?=$item['id'] ?>">授权</button> &nbsp;|&nbsp; <?php }?>
-                            <button class="btn btn-danger btn-sm btn_del" aid="<?=$item['id'] ?>">删除</button>
+                            <button class="btn btn-info btn-sm btn_edit" aid="<?=$item['id'] ?>" data-action="edit">编辑</button>
+                           <?php if(DeviceStatus::HAS_AUTH != $item['status']){?>&nbsp;|&nbsp;<button class="btn btn-primary btn-sm btn_auth" aid="<?=$item['id'] ?>">授权</button> <?php }?>
+                            <?php if(DeviceStatus::HAS_AUTH == $item['status']) :?>
+                                &nbsp;|&nbsp;
+                                <button class="btn btn-danger btn-sm btn_del" aid="<?=$item['id'] ?>">删除</button>
+                             <?php endif;?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -154,8 +168,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             <?php } ?>
             </tbody>
         </table>
+        <div class="action-box">
+            <label><input type="checkbox" class="check-all" value="all" /> 本页全选 </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量授权</button>  <button class="btn btn-danger btn-sm btn_batch_del" >批量删除</button>
+        </div>
     </div>
+
     <div class="panel-footer">
         <div class="hqy-panel-pager">
             <?= LinkPager::widget([
@@ -236,11 +254,15 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                     }
                 }, 'json')
-
             }
         })
+        $('.check-all').click(function(e){
+            var checkVal = $(this).prop('checked');
+             $('.check-item').prop('checked', checkVal)
+
+        })
     });
 </script>
 \ No newline at end of file
@@ -62,7 +62,7 @@ class Device
         if (($count *1) >= ($batchModel->num * 1)) {
             // 超过了限制数，记录到另外一个表里面
             // to do 记录到表里面
-            $failRecord = DeviceAuthFailRepository::findOne(['device_id' => $deviceId]);
+            $failRecord = DeviceAuthFailRepository::findOne(['device_id' => $deviceId, 'is_delete' => 0]);
             if (!$failRecord) {
                 $item = [
                     'manufacture_no'    => $manufactureNo,
@@ -100,6 +100,15 @@ class Device
             $e->mac = $deviceModel->mac;
         } elseif (DeviceStatus::FAIL_AUTH == $deviceModel->status) {
             $e->message = '授权失败';
+        } elseif (DeviceStatus::NO_AUTH == $deviceModel->status) {
+            // 删除之后恢复的数据
+            $deviceModel->status = DeviceStatus::HAS_AUTH;
+            $deviceModel->auth_at = $tt;
+            $deviceModel->save();
+            $e->message = '授权成功';
+            $e->success = true;
+            $e->serial_no = $deviceModel->serial_no;
+            $e->mac = $deviceModel->mac;
         } else {
             $e->message = '授权失败!';
         }