Просмотр исходного кода

修正告警信息ID特殊化引起程序不能运行。

gzjzss 7 лет назад
Родитель
Сommit
a288a6a4f9

+ 2 - 2
application/controllers/Workorder.php

@@ -212,7 +212,7 @@ class Workorder extends MY_Controller
         $warning_level = "50";
         $branch_id = null;
         foreach ($ids as $key => $val) {
-            $warning = $this->warning_model->get_warning_with_id($val);
+            $warning = $this->warning_model->get_warning_with_objectid($val);
             if ($warning) {
                 if (intval($warning['level']) <= intval($warning_level)) {
                     $warning_level = $warning['level'];
@@ -249,7 +249,7 @@ class Workorder extends MY_Controller
         $warning_type = array();
         $branch = null;
         foreach ($ids as $key => $val) {
-            $warning = $this->warning_model->get_warning_with_id($val);
+            $warning = $this->warning_model->get_warning_with_objectid($val);
             if ($warning) {
                 $warning_type[] = $warning['type'];
                 $warning['warning_name'] = $warning_names[$warning['warning_id']];

+ 5 - 0
application/models/Warning_model.php

@@ -15,6 +15,11 @@ class Warning_model extends CI_Model {
         return $this->mongo_db->where(array("warning_id"=> $id))->find_one($this->collection_name);
     }
 
+    public function get_warning_with_objectid($oid){
+	    $_id = $this->mongo_db->get_mongo_id($oid);
+        return $this->mongo_db->where(array("_id"=> $_id))->find_one($this->collection_name);
+    }
+
     public function select_warning($field,$warning_id){
 	    return $this->mongo_db->where(array("warning_id"=> $warning_id))->select($field)->find_one($this->collection_name);
     }

+ 3 - 3
application/views/templates/warning/ignoreindex.html

@@ -49,9 +49,9 @@
         <table id="data_table" data-toggle="table" data-search="true" class="table{if $count} table-hover{/if} table-bordered">
             <thead>
             <tr>
-                <th class="text-center">告警名称</th>
-                <th class="text-center">类型</th>
-                <th class="text-center">等级</th>
+                <th class="text-center">告警事件名称</th>
+                <th class="text-center">事件类型</th>
+                <th class="text-center">主机等级</th>
                 <th class="text-center">所属分支</th>
                 <th class="text-center col-sm-2">内容</th>
                 <th class="text-center" style="width: 180px;">时间</th>

+ 2 - 2
application/views/templates/warning/index.html

@@ -91,7 +91,7 @@
                 <tbody>
                 {foreach $warning_list as $k=>$val}
                     <tr>
-                        <td class="text-center"><input name="ids[]" value="{$val['warning_id']}" data-branch_id="{$val['branch']['branch_id']}" type="checkbox" {if intval($val['status']) >= 20}disabled{/if}></td>
+                        <td class="text-center"><input name="ids[]" value="{$val['_id']}" data-branch_id="{$val['branch']['branch_id']}" type="checkbox" {if intval($val['status']) >= 20}disabled{/if}></td>
                         <td data-searchable="true">{$val['warning_name']}</td>
                         <td class="text-center" data-searchable="true">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                         <td class="text-center"><span class="level level{{$val['level']}}">{$warning_level[$val['level']]}</span></td> <!--已失陷、高可疑、高危、中危、低危-->
@@ -107,7 +107,7 @@
                                 查看详情
                             </a>
                             {if $val['status'] == 10}
-                            <a href="javascript:;" data-id="{$val['warning_id']}" class="create_work_order">
+                            <a href="javascript:;" data-id="{$val['_id']}" class="create_work_order">
                                 生成工单
                             </a>
                             <a href="javascript:;" data-id="{$val['warning_id']}" class="igrone">

+ 12 - 6
application/views/templates/workorder/create.html

@@ -41,20 +41,20 @@
                         <table class="table table-hover table-bordered">
                             <thead>
                             <tr>
-                                <th width="20%" class="text-center">告警名称</th>
-                                <th width="10%" class="text-center">类型</th>
-                                <th width="10%" class="text-center">等级</th>
+                                <th width="20%" class="text-center">告警事件名称</th>
+                                <th width="10%" class="text-center">事件类型</th>
+                                <th width="10%" class="text-center">主机等级</th>
                                 <th width="20%" class="text-center">时间</th>
                                 <th class="text-center">告警详情</th>
                             </tr>
                             </thead>
                             {foreach $warning_list as $k=>$val}
                             <tr>
-                                <td><input type="text" class="form-control" name="warning_name[{$val['warning_id']}]" datatype="s" nullmsg="告警名称不能为空!" value="{$val['warning_name']}"></td>
+                                <td><input type="text" class="form-control" name="warning_name[{$val['_id']}]" datatype="*" nullmsg="告警名称不能为空!" value="{$val['warning_name']}"></td>
                                 <td class="text-center">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                                 <td class="text-center">{$warning_level[$val['level']]}</td> <!--已失陷、高可疑、高危、中危、低危-->
                                 <td>{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
-                                <td><textarea class="form-control" rows="2" name="content[{$val['warning_id']}]" datatype="*" nullmsg="告警内容不能为空!">{$val['content']}</textarea></td>
+                                <td><textarea class="form-control" rows="2" name="content[{$val['_id']}]" datatype="*" nullmsg="告警内容不能为空!">{$val['content']}</textarea></td>
                             </tr>
                             {/foreach}
                         </table>
@@ -176,7 +176,13 @@
                             $("button").removeAttr("disabled");
                         }
                     })
-                })
+                }).error(function(xhr,errorText,errorType){
+                    layer.msg(errorType, {
+                        icon:2, time: 3000
+                    },function () {
+                        parent.layer.close(layer_index);
+                    });
+                });
                 return false;
             }
         });