补采复制爬虫编辑页展示

src/front/spider.go

@@ -88,19 +88,19 @@ type OtherBase struct {
 func (f *Front) LoadSpider(codeTaskIdReState string) error {
 	tmpStr := strings.Split(codeTaskIdReState, "__")
 	code := tmpStr[0]
-	taskId := tmpStr[1]
+	text := tmpStr[1]
 	auth := qu.IntAll(f.GetSession("auth"))
 	restate := -1
-	if taskId == "restate=1" { //重采编辑
+	if text == "1" { //重采编辑
 		restate = 1
-	} else if taskId == "restate=2" {
+	} else if text == "2" {
 		restate = 2
-	} else if taskId == "restate=3" {
+	} else if text == "3" {
 		restate = 3
-	} else {
-		if auth == u.Role_Dev && qu.ObjToString(f.GetSession(taskId)) == "" {
+	} else if text != "bu" {
+		if auth == u.Role_Dev && qu.ObjToString(f.GetSession(text)) == "" {
 			xgTime := time.Unix(time.Now().Unix(), 0).Format("2006-01-02 15:04:05")
-			f.SetSession(taskId, xgTime)
+			f.SetSession(text, xgTime)
 		}
 	}
 	copy := f.GetString("copy")
@@ -110,7 +110,7 @@ func (f *Front) LoadSpider(codeTaskIdReState string) error {
 		//lua, _ := u.MgoE.FindOne("luaconfig", map[string]interface{}{"code": code})
 		lua, _ := u.MgoEB.FindOne("luaconfig", map[string]interface{}{"code": code})
 		//爬虫开发人员编辑爬虫，修改爬虫信息
-		if auth == u.Role_Dev && qu.ObjToString((*lua)["spidertype"]) == "increment" {
+		if auth == u.Role_Dev && text != "bu" && qu.ObjToString((*lua)["spidertype"]) == "increment" {
 			(*lua)["spidertype"] = "history"
 			(*lua)["incrementevent"] = (*lua)["event"]
 		}
@@ -170,7 +170,7 @@ func (f *Front) LoadSpider(codeTaskIdReState string) error {
 				js, _ := json.MarshalIndent((*lua)["model"], "", "  ")
 				(*lua)["js"] = string(js)
 				f.T["lua"] = lua
-				f.T["taskId"] = taskId
+				f.T["taskId"] = text
 				f.T["restate"] = restate
 				f.T["isflow"] = (*lua)["isflow"]
 				f.T["spidertype"] = (*lua)["spidertype"]

src/taskManager/taskManager.go

@@ -685,8 +685,7 @@ func (t *TaskM) Audit() {
 		//search := strings.Replace(searchStr, " ", "", -1)
 		search := strings.TrimSpace(searchStr)
 		//查询自己的任务
-		query := map[string]interface{}{}
-		query = map[string]interface{}{
+		query := map[string]interface{}{
 			"i_state": map[string]interface{}{
 				"$gte": 3,
 				"$lte": 5,
@@ -710,6 +709,15 @@ func (t *TaskM) Audit() {
 				},
 			}
 		}
+		identity := qu.IntAll(t.GetSession("identity"))
+		if identity == 0 { //外包审核员
+			if tmpIds := t.GetSession("ids"); tmpIds != nil {
+				ids := qu.ObjArrToStringArr(tmpIds.([]interface{}))
+				query["s_modifyid"] = map[string]interface{}{
+					"$in": ids,
+				}
+			}
+		}
 		if search != "" {
 			query["$or"] = []interface{}{
 				map[string]interface{}{"s_code": map[string]interface{}{"$regex": search}},
@@ -729,6 +737,7 @@ func (t *TaskM) Audit() {
 		sorta := strings.Replace(sort, "{", "", -1)
 		sortb := strings.Replace(sorta, "}", "", -1)
 		sortNew := `{"l_complete": 1,` + sortb + `}`
+		qu.Debug("task audit query:", query)
 		task, _ := u.MgoEB.Find("task", query, sortNew, nil, false, start, limit)
 		count := u.MgoEB.Count("task", query)
 		if task != nil && len(*task) > 0 {

src/timetask/timetask.go

@@ -27,7 +27,7 @@ func TimeTask() {
 	c.AddFunc("0 0 */1 ? * *", CheckLuaMove)              //7000节点转增量爬虫失败告警
 	c.AddFunc("0 */10 * * * *", SpiderMoveEvent)          //7000节点转增量爬虫
 	c.AddFunc("0 0 8 * * *", UpdateImportantCode)         //更新重点网站爬虫信息
-	c.AddFunc("0 */5 0 * * *", luacheck.TimeTaskLuaCheck) //更新重点网站爬虫信息
+	c.AddFunc("0 */5 * * * *", luacheck.TimeTaskLuaCheck) //爬虫机检定时任务
 }
 
 // 检测创建任务失败的爬虫
@@ -63,7 +63,7 @@ func CheckCreateTask() {
 func UpdateSiteInfo() {
 	defer qu.Catch()
 	qu.Debug("定时更新站点信息开始...")
-	sites, _ := util.MgoEB.Find(sp.Config.SiteColl, ``, ``, `{"site":1}`, false, -1, -1)
+	sites, _ := util.MgoEB.Find(sp.Config.SiteColl, map[string]interface{}{"delete": false}, ``, `{"site":1}`, false, -1, -1)
 	for _, s := range *sites {
 		site := qu.ObjToString(s["site"])
 		domain, status, event, platform, infotype, specialtype, _ := util.GetLuasInfoBySite(site, "", "", "")
@@ -84,7 +84,6 @@ func UpdateSiteInfo() {
 		util.MgoEB.UpdateById(sp.Config.SiteColl, s["_id"], set)
 	}
 	qu.Debug("定时更新站点信息完成...")
-
 }
 
 // 更新重点网站爬虫信息

src/web/templates/audit.html

@@ -18,8 +18,8 @@
 								<td>爬虫代码</td>
 								<td>网站名称</td>
 								<td>栏目名称</td>
+								<td>维护人</td>
 								<td>任务状态</td>
-								<td>紧急度</td>
 								<td>最迟完成时间</td>
 								<th class="hidden-xs">操作</th>
 							</tr>
@@ -41,7 +41,7 @@
 				
        		 },
 			"columnDefs": [
-			    { "orderable": false, "targets": 6,"ordering":false }
+				{ "orderable": false, "targets": [1,2,3,4,5,6] }
 			],	
 			"lengthChange":false,
 			"serverSide": true,
@@ -53,8 +53,8 @@
 				{"data":"s_code"},
 	            {"data": "s_site"},
 				{"data": "s_channel"},
+				{"data": "s_modify"},
 				{"data": "i_state"},
-				{"data":"s_urgency"},
 				{"data":"l_complete"},
 				{"data":"_id",render:function(val,a,row){
 					var div=$("<div><div class=\"btn-group\"></div></div>")

src/web/templates/errdata.html

@@ -160,13 +160,13 @@
           tmp = '<div>' +
               '<a class="btn btn-sm btn-primary" target="_Blank" href="/center/errorData/findByCode?code='+val+'&date='+date+'&restate='+row.restate+'">查看数据</a>'
           if(row.restate == 1 ){//只有已确认的爬虫才能编辑
-            tmp = tmp + '<a class="btn btn-sm btn-info" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__restate=1">编辑爬虫</a>'
+            tmp = tmp + '<a class="btn btn-sm btn-info" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__1">编辑爬虫</a>'
           }else if(row.restate == 2 ){//已修复的爬虫，爬虫人员可以查看爬虫
             {{if eq (session "auth") 1}}
-             tmp = tmp + '<a class="btn btn-sm btn-warning" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__restate=2">查看爬虫</a>'
+             tmp = tmp + '<a class="btn btn-sm btn-warning" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__2">查看爬虫</a>'
             {{end}}
           }else if(row.restate >= 3 ){
-            tmp = tmp + '<a class="btn btn-sm btn-warning" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__restate=3">查看爬虫</a>'
+            tmp = tmp + '<a class="btn btn-sm btn-warning" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__3">查看爬虫</a>'
           }
           tmp = tmp + '</div>';
           return tmp
@@ -175,7 +175,7 @@
           var tmp = ""
           {{if gt (session "auth") 1}}
           if(row.restate == 2){//已修复的爬虫才能审核
-            tmp ='<a class="btn btn-sm btn-primary" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__restate=2">审核爬虫</a>'
+            tmp ='<a class="btn btn-sm btn-primary" target="_Blank"  href="/center/spider/edit/'+row["encode"]+'__2">审核爬虫</a>'
           }else if(row.restate == 3){//爬虫重新上架
             tmp ='<a class="btn btn-sm btn-primary" onclick="updateonlinelua(\''+row.spidercode+'\',\''+row.state+'\')">更新上架</a>'
           }else if(row.restate ==0 && row.errnum ==0 && row.rerrnum ==0){//确认修复

src/web/templates/index.html

@@ -805,7 +805,7 @@ $(function(){
 			success: function(r){
 			  if(r&&r.success){
 				$("#modal-spidercopy").modal("hide");
-				window.open("/center/spider/edit/"+r.encode+"__");
+				window.open("/center/spider/edit/"+r.encode+"__bu");
 			  }else{
 				alert(r.text);
 			  }

src/web/templates/spiderbase.html

@@ -359,7 +359,7 @@
 						页面编码
 					</label>
 					<div class="col-sm-7">
-						<select name="Base.SpiderPageEncoding" disabled id="spiderPageEncoding" class="form-control">
+						<select name="Base.SpiderPageEncoding" id="spiderPageEncoding" class="form-control">
 							<option value="gbk">
 								GBK
 							</option>