新增数据功能修改

src/service/repair_service.go

@@ -255,12 +255,13 @@ func (jy *RepairRule) RepairPub() {
 		if v == "" || v == nil {
 			continue
 		}
-		if k == "publishtime" {
+		if k == "datatype" && qu.ObjToString(v) == "竞品" {
+			save["href"] = fmt.Sprintf("https://www.jianyu360.cn/article/content/%s.html", qu.CommonEncodeArticle("content", mongodb.BsonIdToSId(save["_id"])))
+			save["competehref"] = strings.Trim(qu.ObjToString((*jsdata)["href"]), " ")
+		} else if k == "publishtime" {
 			save[k] = qu.Int64All(v)
-		} else if k == "href" && strings.Trim(qu.ObjToString(v), " ") == "#" {
-			var Url = "https://www.jianyu360.cn/article/content/%s.html"
-			save["href"] = fmt.Sprintf(Url, qu.CommonEncodeArticle("content", mongodb.BsonIdToSId(save["_id"])))
-			save["competehref"] = "#"
+		} else if k == "href" && qu.ObjToString((*jsdata)["datatype"]) == "竞品" {
+			continue
 		} else if k == "detail" {
 			v = strings.Replace(qu.ObjToString(v), "&#60;", "<", -1)
 			v = strings.Replace(qu.ObjToString(v), "&#62;", ">", -1)
@@ -282,6 +283,7 @@ func (jy *RepairRule) RepairPub() {
 			save[k] = v
 		}
 	}
+	qu.Debug(save)
 	// spider_code
 	save["spidercode"] = AddSpiderCode
 	// s_sha
@@ -316,7 +318,8 @@ func (jy *RepairRule) RepairPub() {
 			//PutRedis("title_repeat_fulljudgement", db, hashHref, mongodb.BsonIdToSId(save["_id"]), -1)
 			//r := RedisClusterPut(RedisCluster, context.TODO(), hashHref, "", -1)
 			_, _ = spiderutil.AddBloomRedis("href", href)
-
+		} else if competehref := qu.ObjToString(save["competehref"]); competehref != "" && competehref != "#" {
+			_, _ = spiderutil.AddBloomRedis("href", competehref)
 		}
 		//r := RedisClusterPut(RedisCluster, context.TODO(), shaid, "", 365*86400)
 		_, _ = spiderutil.AddBloomRedis("detail", spiderutil.FilterDetail(qu.ObjToString(save["detail"])))

src/web/templates/repair/jy_create_new.html

@@ -164,21 +164,29 @@
                               <input type="text" class="form-control" id="channel" placeholder="栏目"
                                      value="" required>
                           </div>
-                          <label class="col-sm-2 control-label"><span style="color:red;">* </span>发布时间</label>
-                          <div class="col-sm-3">
-                               <div class="wui-content">
-                                    <div class="wui-area" id="publishtime">
-                                        <wui-date
-                                                format="yyyy-mm-dd hh:mm:ss"
-                                                placeholder="请选择或输入开始日期"
-                                                id="date4"
-                                                btns="{'ok':'确定','now':'此刻'}"
-                                                ng-model="date4">
-                                        </wui-date>
-                                    </div>
-                               </div>
-                          </div>
+                        <label class="col-sm-2 control-label"><span style="color:red;">* </span>数据类型</label>
+                        <div class="col-sm-3">
+                            <select class="form-control" data-live-search="true" id="datatype">
+                                <option value="正常">正常类型</option>
+                                <option value="竞品">竞品类型</option>
+                            </select>
+                        </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label"><span style="color:red;">* </span>发布时间</label>
+                        <div class="col-sm-3">
+                            <div class="wui-content">
+                                <div class="wui-area" id="publishtime">
+                                    <wui-date
+                                            format="yyyy-mm-dd hh:mm:ss"
+                                            placeholder="请选择或输入开始日期"
+                                            id="date4"
+                                            btns="{'ok':'确定','now':'此刻'}"
+                                            ng-model="date4">
+                                    </wui-date>
+                                </div>
+                            </div>
+                        </div>
                 </div>
                 <hr>
                 <div class="box-body">
@@ -197,16 +205,16 @@
                           <div class="col-sm-3">
                               <input type="text" class="form-control" id="agency" placeholder="代理机构" value="">
                           </div>
-                          <label class="col-sm-2 control-label">采购单位</label>
-                          <div class="col-sm-3">
-                              <input type="text" class="form-control" id="buyer" placeholder="采购单位" value="">
+                            <label class="col-sm-2 control-label">中标单位</label>
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control" id="winner" placeholder="中标单位，可多个英文逗号隔开" value="">
                           </div>
                     </div>
                     <div class="form-group">
-                          <label class="col-sm-2 control-label">中标单位</label>
-                          <div class="col-sm-3">
-                              <input type="text" class="form-control" id="winner" placeholder="中标单位，可多个英文逗号隔开" value="">
-                          </div>
+                        <label class="col-sm-2 control-label">采购单位</label>
+                        <div class="col-sm-3">
+                            <input type="text" class="form-control" id="buyer" placeholder="采购单位" value="">
+                        </div>
                     </div>
                 </div>
                 <div class="box-body">
@@ -307,9 +315,11 @@
     }
 
     function pubData() {
+        dataMap["datatype"] = $('#datatype').val();
         dataMap["title"] = $('#title').val();
         dataMap["site"] = $('#site').val();
         dataMap["href"] = $('#href').val();
+
         dataMap["channel"] = $('#channel').val();
         if ($('#publishtime').find("input").val() != "") {
             var start = $('#publishtime').find("input").val();
@@ -322,19 +332,19 @@
         }else {
             dataMap["publishtime"] = ""
         }
-        dataMap["detail"] = $('#jsonDetail').val()
-        dataMap["contenthtml"] = $('#jsonContentHtml').val()
-        dataMap["summary"] = $('#summary').val()
+        dataMap["detail"] = $('#jsonDetail').val();
+        dataMap["contenthtml"] = $('#jsonContentHtml').val();
+        dataMap["summary"] = $('#summary').val();
         if (dataMap["title"] == "" || dataMap["site"] == "" || dataMap["href"] == "" || dataMap["channel"] == "" ||
             dataMap["publishtime"] == "" ||  dataMap["detail"] == "" || dataMap["contenthtml"] == "") {
             alert("请填写必须字段！");
             return
         }
-        dataMap["budget"] = $('#budget').val()
-        dataMap["bidamount"] = $('#bidamount').val()
-        dataMap["agency"] = $('#agency').val()
-        dataMap["buyer"] = $('#buyer').val()
-        dataMap["winner"] = $('#winner').val()
+        dataMap["budget"] = $('#budget').val();
+        dataMap["bidamount"] = $('#bidamount').val();
+        dataMap["agency"] = $('#agency').val();
+        dataMap["buyer"] = $('#buyer').val();
+        dataMap["winner"] = $('#winner').val();
         showConfirm("确定发布该信息到剑鱼网站？", function() {
             $.ajax({
                 url: "/service/jy/repair/pubSave",