fix:修改信息发布类型判断

rpc/common/internal/logic/sensitivemethodlogic.go

@@ -98,31 +98,6 @@ func (l *SensitiveMethodLogic) SensitiveMethod(in *commoninfo.SensitiveRequest)
 	query["id"] = in.Id
 	upData["status"] = 2
 	switch in.MsgType {
-	case "1", "2", "4", "5", "6": //招标信息
-		data := md.Mysql.FindOne("information", query, "", "")
-		if data != nil && len(*data) > 0 {
-			//是否已被删除
-			isDel = mc.IntAll((*data)["is_del"]) == -1
-			//未删除 且 不用人工审核 直接入消息队列 进行发布流程
-			if !isDel && isPublishInfo {
-				upData["status"] = 3
-				upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
-				upData["review_desc"] = "自动审批通过"
-				//调用发布功能
-				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, in.Id, "2", in.MsgType, false, *data)
-				if err != nil || nsq.NsqPushInfo() != nil {
-					resp.ErrCode = -2
-					resp.ErrMsg = "发布信息：信息入nsq消息队列失败"
-					//break
-				}
-			}
-			//修改此信息敏感词过滤结果
-			if !md.Mysql.Update("information", query, upData) {
-				log.Println("调用信息发布成功，更新信息失败", query, upData)
-				resp.ErrCode = -1
-				resp.ErrMsg = resp.ErrMsg + "敏感词过滤成功，更新库数据信息失败"
-			}
-		}
 	case "3": //供应信息
 		data := md.Mysql.FindOne("supply_info", query, "", "")
 		if data != nil && len(*data) > 0 {
@@ -165,8 +140,30 @@ func (l *SensitiveMethodLogic) SensitiveMethod(in *commoninfo.SensitiveRequest)
 			}
 		}
 	default:
-		resp.ErrCode = -1
-		resp.ErrMsg = "信息类型错误"
+		data := md.Mysql.FindOne("information", query, "", "")
+		if data != nil && len(*data) > 0 {
+			//是否已被删除
+			isDel = mc.IntAll((*data)["is_del"]) == -1
+			//未删除 且 不用人工审核 直接入消息队列 进行发布流程
+			if !isDel && isPublishInfo {
+				upData["status"] = 3
+				upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
+				upData["review_desc"] = "自动审批通过"
+				//调用发布功能
+				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, in.Id, "2", in.MsgType, false, *data)
+				if err != nil || nsq.NsqPushInfo() != nil {
+					resp.ErrCode = -2
+					resp.ErrMsg = "发布信息：信息入nsq消息队列失败"
+					//break
+				}
+			}
+			//修改此信息敏感词过滤结果
+			if !md.Mysql.Update("information", query, upData) {
+				log.Println("调用信息发布成功，更新信息失败", query, upData)
+				resp.ErrCode = -1
+				resp.ErrMsg = resp.ErrMsg + "敏感词过滤成功，更新库数据信息失败"
+			}
+		}
 	}
 
 	return &resp, nil

rpc/consumer/internal/logic/infochangelogic.go

@@ -50,7 +50,16 @@ func (l *InfoChangeLogic) InfoChange(in *consumerinfo.InfoDetailReq) (*consumeri
 
 		data := make(map[string]interface{})
 		switch in.MsgType {
-		case 1, 2, 4, 5, 6:
+		case 3:
+			if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = `+util.StrFormat(in.AppId), mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
+				data = (*_d)[0]
+				Results.ValidityTime = mc.InterfaceToStr(data["validity_time"])
+			} else {
+				dataRes.ErrCode = -1
+				dataRes.ErrMsg = "查询数据失败"
+				break
+			}
+		default:
 			if _d := model.Mysql.SelectBySql(`SELECT a.*,b.title as relatedTitle FROM information a
 				LEFT JOIN information b on (a.related_id =b.id) where a.id = ? and a.app_id = `+util.StrFormat(in.AppId), mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
 				data = (*_d)[0]
@@ -76,15 +85,6 @@ func (l *InfoChangeLogic) InfoChange(in *consumerinfo.InfoDetailReq) (*consumeri
 				dataRes.ErrMsg = "查询数据失败"
 				break
 			}
-		case 3:
-			if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = `+util.StrFormat(in.AppId), mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
-				data = (*_d)[0]
-				Results.ValidityTime = mc.InterfaceToStr(data["validity_time"])
-			} else {
-				dataRes.ErrCode = -1
-				dataRes.ErrMsg = "查询数据失败"
-				break
-			}
 		}
 
 		Results.Province = mc.InterfaceToStr(data["province"])
@@ -118,42 +118,43 @@ func (l *InfoChangeLogic) InfoChange(in *consumerinfo.InfoDetailReq) (*consumeri
 		query["id"] = mc.IntAll(msgId)
 		query["app_id"] = in.AppId
 		switch in.MsgType {
-		case 1, 2, 4, 5, 6:
-			if data := model.Mysql.FindOne("information", query, "", ""); data != nil && len(*data) > 0 {
+		case 3:
+			if data := model.Mysql.FindOne("supply_info", query, "", ""); data != nil && len(*data) > 0 {
 				upQuery["is_del"] = -1
-				if !model.Mysql.Update("information", query, upQuery) {
+				if !model.Mysql.Update("supply_info", query, upQuery) {
 					dataRes.ErrCode = -1
 					dataRes.ErrMsg = "物理删除失败"
-					return &dataRes, fmt.Errorf("物理删除失败")
+					break
 				} else if mc.IntAll((*data)["published"]) == 2 {
-					//如果是已经正常发布的信息 同步调用nsq删除
-					nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, mc.InterfaceToStr((*data)["id"]), "3", mc.InterfaceToStr((*data)["type"]), false, *data)
-					if err != nil || nsq.NsqPushInfo() != nil {
+					if !esmd.DelSupplyInfo(mc.InterfaceToStr((*data)["id"])) {
 						dataRes.ErrCode = -1
-						dataRes.ErrMsg = "nsq回调删除，同步删除信息失败"
+						dataRes.ErrMsg = "es删除供应信息失败"
 					}
 				}
 			} else {
 				dataRes.ErrCode = -1
 				dataRes.ErrMsg = "查询数据失败"
 			}
-		case 3:
-			if data := model.Mysql.FindOne("supply_info", query, "", ""); data != nil && len(*data) > 0 {
+		default:
+			if data := model.Mysql.FindOne("information", query, "", ""); data != nil && len(*data) > 0 {
 				upQuery["is_del"] = -1
-				if !model.Mysql.Update("supply_info", query, upQuery) {
+				if !model.Mysql.Update("information", query, upQuery) {
 					dataRes.ErrCode = -1
 					dataRes.ErrMsg = "物理删除失败"
-					break
+					return &dataRes, fmt.Errorf("物理删除失败")
 				} else if mc.IntAll((*data)["published"]) == 2 {
-					if !esmd.DelSupplyInfo(mc.InterfaceToStr((*data)["id"])) {
+					//如果是已经正常发布的信息 同步调用nsq删除
+					nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, mc.InterfaceToStr((*data)["id"]), "3", mc.InterfaceToStr((*data)["type"]), false, *data)
+					if err != nil || nsq.NsqPushInfo() != nil {
 						dataRes.ErrCode = -1
-						dataRes.ErrMsg = "es删除供应信息失败"
+						dataRes.ErrMsg = "nsq回调删除，同步删除信息失败"
 					}
 				}
 			} else {
 				dataRes.ErrCode = -1
 				dataRes.ErrMsg = "查询数据失败"
 			}
+
 		}
 	default:
 		dataRes.ErrCode = -1

rpc/consumer/internal/logic/inforelatedlogic.go

@@ -64,10 +64,10 @@ func (l *InfoRelatedLogic) InfoRelated(in *consumerinfo.UserIdReq) (*consumerinf
 	case 1:
 		var allData *[]map[string]interface{}
 		switch in.MsgType {
-		case 1, 2, 4, 5, 6:
-			allData = model.Mysql.SelectBySql(`SELECT * from information WHERE user_id="` + in.UserId + `"` + queryName + ` order by create_time desc limit 1`)
 		case 3:
 			allData = model.Mysql.SelectBySql(`SELECT * from supply_info WHERE user_id="` + in.UserId + `"` + queryName + ` order by create_time desc limit 1`)
+		default:
+			allData = model.Mysql.SelectBySql(`SELECT * from information WHERE user_id="` + in.UserId + `"` + queryName + ` order by create_time desc limit 1`)
 		}
 		if allData == nil || len(*allData) == 0 {
 			return &resp, nil

rpc/consumer/internal/logic/publishinfologic.go

@@ -65,7 +65,12 @@ func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consum
 	publishData["status"] = 1
 
 	switch in.MsgType {
-	case 1, 2, 4, 5, 6:
+	case 3:
+		if in.Deadline != "" {
+			publishData["validity_time"] = in.Deadline //信息有效期
+		}
+		id = model.Mysql.Insert("supply_info", publishData)
+	default:
 		publishData["publishing_media"] = in.JyPublishingMedia
 		publishData["recommended_service"] = in.RecommendedService
 		publishData["related_id"] = mc.IntAll(se.SE.DecodeString(in.RelatedId)) //关联公告id
@@ -77,15 +82,6 @@ func (l *PublishInfoLogic) PublishInfo(in *consumerinfo.PublishInfoReq) (*consum
 		publishData["amount"] = in.Amount                                       //中标金额
 
 		id = model.Mysql.Insert("information", publishData)
-	case 3:
-		if in.Deadline != "" {
-			publishData["validity_time"] = in.Deadline //信息有效期
-		}
-		id = model.Mysql.Insert("supply_info", publishData)
-	default:
-		res.ErrCode = -1
-		res.ErrMsg = "数据类型有误"
-		return &res, nil
 	}
 	if id < 1 {
 		res.ErrCode = -1

rpc/manager/internal/logic/infodetaillogic.go

@@ -48,7 +48,16 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 	data := make(map[string]interface{})
 	msgId := se.SE.DecodeString(in.MsgId)
 	switch in.Type {
-	case 1, 2, 4, 5, 6:
+	case 3:
+		if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id =? `, msgId, in.AppId); _d != nil && len(*_d) > 0 {
+			data = (*_d)[0]
+			infoData.ValidityTime = common.InterfaceToStr(data["validity_time"])
+		} else {
+			dataRes.ErrCode = -1
+			dataRes.ErrMsg = "查询数据失败"
+			goto env
+		}
+	default:
 		if _d := model.Mysql.SelectBySql(`SELECT a.*,b.title as relatedTitle FROM information a 
 				LEFT JOIN information b on (a.related_id =b.id) where a.id =? and a.app_id = ?`, msgId, in.AppId); _d != nil && len(*_d) > 0 {
 			data = (*_d)[0]
@@ -74,19 +83,6 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 			dataRes.ErrMsg = "查询数据失败"
 			goto env
 		}
-	case 3:
-		if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id =? `, msgId, in.AppId); _d != nil && len(*_d) > 0 {
-			data = (*_d)[0]
-			infoData.ValidityTime = common.InterfaceToStr(data["validity_time"])
-		} else {
-			dataRes.ErrCode = -1
-			dataRes.ErrMsg = "查询数据失败"
-			goto env
-		}
-	default:
-		dataRes.ErrCode = -1
-		dataRes.ErrMsg = "数据类型有误"
-		return &dataRes, nil
 	}
 	infoData.Province = common.InterfaceToStr(data["province"])
 	infoData.City = common.InterfaceToStr(data["city"])

rpc/manager/internal/logic/infoexaminelogic.go

@@ -51,19 +51,16 @@ func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.Inf
 		upData["review_name"] = in.ReviewName
 		upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
 		switch in.MsgType {
-		case 1, 2, 4, 5, 6:
-			if !md.Mysql.Update("information", query, upData) {
-				resp.ErrCode = -1
-				resp.ErrMsg = "审核不通过，更新数据失败"
-			}
 		case 3:
 			if !md.Mysql.Update("supply_info", query, upData) {
 				resp.ErrCode = -1
 				resp.ErrMsg = "审核不通过，更新数据失败"
 			}
 		default:
-			resp.ErrCode = -1
-			resp.ErrMsg = "信息类型有误"
+			if !md.Mysql.Update("information", query, upData) {
+				resp.ErrCode = -1
+				resp.ErrMsg = "审核不通过，更新数据失败"
+			}
 		}
 	case 2:
 		query["id"] = msgId
@@ -73,26 +70,6 @@ func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.Inf
 		upData["status"] = 4
 		upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
 		switch in.MsgType {
-		case 1, 2, 4, 5, 6:
-			data := md.Mysql.FindOne("information", query, "", "")
-			if data == nil || len(*data) < 1 {
-				resp.ErrCode = -1
-				resp.ErrMsg = "人工审核通过，获取信息失败"
-				break
-			} else {
-				//nsq发布信息
-				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, msgId, "2", common.InterfaceToStr(in.MsgType), false, *data)
-				if err != nil || nsq.NsqPushInfo() != nil {
-					resp.ErrCode = -1
-					resp.ErrMsg = "人工审核通过，调用nsq失败"
-					break
-				}
-
-				if !md.Mysql.Update("information", query, upData) {
-					resp.ErrCode = -1
-					resp.ErrMsg = "人工审核通过，nsq发布成功，更新信息失败"
-				}
-			}
 		case 3:
 			data := md.Mysql.FindOne("supply_info", query, "", "")
 			if data == nil || len(*data) < 1 {
@@ -129,8 +106,25 @@ func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.Inf
 				}
 			}
 		default:
-			resp.ErrCode = -1
-			resp.ErrMsg = "信息类型有误"
+			data := md.Mysql.FindOne("information", query, "", "")
+			if data == nil || len(*data) < 1 {
+				resp.ErrCode = -1
+				resp.ErrMsg = "人工审核通过，获取信息失败"
+				break
+			} else {
+				//nsq发布信息
+				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, msgId, "2", common.InterfaceToStr(in.MsgType), false, *data)
+				if err != nil || nsq.NsqPushInfo() != nil {
+					resp.ErrCode = -1
+					resp.ErrMsg = "人工审核通过，调用nsq失败"
+					break
+				}
+
+				if !md.Mysql.Update("information", query, upData) {
+					resp.ErrCode = -1
+					resp.ErrMsg = "人工审核通过，nsq发布成功，更新信息失败"
+				}
+			}
 
 		}
 	default:

rpc/manager/internal/logic/infolistlogic.go

@@ -76,7 +76,6 @@ func (l *InfoListLogic) InfoList(in *manager.InfoListReq) (*manager.InfoListResp
 	if in.ReviewStatus != 0 {
 		query = append(query, ` status =`+common.InterfaceToStr(in.ReviewStatus))
 		//supQuery = append(supQuery, ` status =`+common.Str(in.ReviewStatus))
-
 	}
 	if len(query) > 0 {
 		queryInfo = fmt.Sprintf(" where %s", strings.Join(query, " and "))

rpc/manager/internal/logic/infoonekeyactionlogic.go

@@ -102,7 +102,8 @@ func (l *InfoOneKeyActionLogic) InfoOneKeyAction(in *manager.OneKeyActionReq) (*
 					}
 					resp.ErrCode = -1
 					resp.ErrMsg = resp.ErrMsg + "信息发布调用失败"
-				case "1", "2", "4", "5", "6": //招标信息，采购信息
+				default:
+					//招标信息，采购信息
 					//nsq发布信息
 					nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, msgId, "2", mc.InterfaceToStr(in.MsgType), false, res)
 					if err != nil || nsq.NsqPushInfo() != nil {
@@ -137,7 +138,8 @@ func (l *InfoOneKeyActionLogic) InfoOneKeyAction(in *manager.OneKeyActionReq) (*
 							resp.ErrMsg = "es删除供应信息失败"
 						}
 					}
-				case "1", "2", "4", "5", "6": //删除 招标信息，采购信息 索引
+				default:
+					//删除 招标信息，采购信息 索引
 					if mc.IntAll(res["published"]) == 2 {
 						//如果是已经正常发布的信息 同步调用nsq删除
 						nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, msgId, "3", in.MsgType, false, res)

rpc/model/es/es.go

@@ -87,7 +87,7 @@ func SupplyRedis(in *consumerinfo.SupplyInfoSearchReq) (int64, *[]map[string]int
 	}
 	if in.PageSize*in.PageIndex <= mc.Int64All(len(listData)) {
 		list = listData[(in.PageSize-1)*in.PageIndex : in.PageSize*in.PageIndex]
-	} else if (in.PageSize-1)*in.PageIndex <= mc.Int64All(len(listData)) {
+	} else {
 		list = listData[(in.PageSize-1)*in.PageIndex:]
 	}