物料保存

api/internal/logic/materialsavelogic.go

@@ -8,7 +8,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"log"
 	"strings"
 )
 
@@ -40,21 +39,20 @@ func (l *MaterialSaveLogic) MaterialSave(req *types.MaterialSaveReq) (resp *type
 		EntId:           req.EntId,
 		ImgWebpage:      req.ImgWebpage,
 	})
-	if res.ErrorCode != 1 {
+	if err != nil {
 		return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg}, err
 	}
 	msgId := res.MsgId
 	//log.Println("***************88", msgId)
-	res1, err := l.svcCtx.MessageCenterRpc.UpdateMsgSummary(l.ctx, &messageclient.UpdateMsgSummaryReq{
+	_, err = l.svcCtx.MessageCenterRpc.UpdateMsgSummary(l.ctx, &messageclient.UpdateMsgSummaryReq{
 		MsgLogId: msgId,
 		GroupId:  11,
 		MsgType:  14,
 	})
-	log.Println(res1.Code, res1.Message)
-	if res1.Code < 1 {
-		return &types.BiResp{Error_code: -1, Error_msg: res1.Message}, err
+	if err != nil {
+		return &types.BiResp{Error_code: -1, Error_msg: err.Error()}, err
 	}
-	res2, err := l.svcCtx.MessageCenterRpc.BitmapSaveMsg(l.ctx, &messageclient.MultipleSaveMsgReq{
+	_, err = l.svcCtx.MessageCenterRpc.BitmapSaveMsg(l.ctx, &messageclient.MultipleSaveMsgReq{
 		UserIds:    strings.Join(res.UserIdArr, ","),
 		Title:      "您有1个宣传物料需要发布！",
 		Content:    fmt.Sprintf("%s给你分享了运营宣传物料，请及时处理。点击查看详情。", req.CreateUser),
@@ -67,9 +65,9 @@ func (l *MaterialSaveLogic) MaterialSave(req *types.MaterialSaveReq) (resp *type
 		WxPushUrl:  fmt.Sprintf("/jy_mobile/message/materialDetail?msgLogId=%d&id=%d", msgId, msgId),
 		IosPushUrl: fmt.Sprintf("/jy_mobile/message/materialDetail?msgLogId=%d&id=%d", msgId, msgId),
 	})
-	if res2.Code < 1 || err != nil {
-		return &types.BiResp{Error_code: -1, Error_msg: res2.Message}, err
+	if err != nil {
+		return &types.BiResp{Error_code: -1, Error_msg: err.Error()}, err
 	}
 
-	return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg}, err
+	return &types.BiResp{Error_code: 1, Error_msg: ""}, err
 }

rpc/internal/logic/materialsavelogic.go

@@ -1,14 +1,19 @@
 package logic
 
 import (
+	"bp.jydev.jianyu360.cn/BaseService/biService/entity"
 	IC "bp.jydev.jianyu360.cn/BaseService/biService/rpc/internal/config"
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/pb"
 	"bp.jydev.jianyu360.cn/BaseService/biService/service"
+	fpb "bp.jydev.jianyu360.cn/BaseService/fileCenter/rpc/pb"
 	"context"
 	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/zeromicro/go-zero/core/logx"
 	"log"
+	"path"
+	"strings"
 )
 
 type MaterialSaveLogic struct {
@@ -39,7 +44,7 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 	//获取分发人的userid
 	userIdArr := service.GetSendUserId(in.ReceiveUserId, in.EntId)
 	log.Println("物料分发给：", userIdArr)
-	/*if in.QrcodeUrl == "" {
+	if in.QrcodeUrl == "" {
 		return &pb.MaterialSaveResp{
 			ErrorCode:  1,
 			ErrorMsg:   "",
@@ -47,34 +52,34 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 			MaterialId: mid,
 			UserIdArr:  userIdArr,
 		}, nil
-	}*/
-	//positionArr := strings.Split(in.ReceiveUserId, ",")
-	/*for k, v := range strings.Split(in.ReceiveUserName, ",") {
+	}
+	positionArr := strings.Split(in.ReceiveUserId, ",")
+	for k, v := range strings.Split(in.ReceiveUserName, ",") {
 		if len(strings.Split(in.FileUrl, ",")) == 0 {
 			break
 		}
+		personCode := service.GetPersonCode(gconv.Int64(positionArr[k]))
 		for _, val := range strings.Split(in.FileUrl, ",") {
 			go func(fileUrl, name string, positionId int64) {
-				imgByte, err := service.PersonImgSaveComposite(fileUrl, in.QrcodeUrl, name, positionId)
+				imgByte, err := service.PersonImgSaveComposite(fileUrl, in.QrcodeUrl, name, personCode, positionId)
+				log.Println(imgByte)
 				if err != nil {
 					log.Println("合成图片出错：", err)
 					return
 				}
 				log.Println("图片名称", path.Base(fileUrl))
-				up, err := entity.FileCenterRpc.Upload(l.ctx, &fpb.UploadReq{
+				up, err := entity.FileCenterRpc.Upload(context.Background(), &fpb.UploadReq{
 					File:           imgByte,
 					OssBucketName:  entity.OssBucketName,
 					OssUrl:         entity.OssUrl,
 					Name:           path.Base(fileUrl),
 					NeedEncryption: false,
 				})
+				//log.Println(err)
 				if up == nil || up.Url == "" {
 					log.Println("上传合成图片失败：", err)
 					return
 				}
-				//key := up.Key
-				//ossAddr = gconv.String(Ret["downUrl"])
-
 				ok := service.PersonImageSave(up.Url, msgId, positionId, mid)
 				if !ok {
 					log.Println("合成图片存库失败")
@@ -82,7 +87,7 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 				}
 			}(val, v, gconv.Int64(positionArr[k]))
 		}
-	}*/
+	}
 
 	return &pb.MaterialSaveResp{
 		ErrorCode:  1,

service/material.go

@@ -84,7 +84,7 @@ func PersonImageSave(imgUrl string, msgId, positionId, materialsId int64) bool {
 	return entity.BiService.Insert("operating_materials_attachment", saveMap) > 0
 }
 
-func PersonImgSaveComposite(fileUrl, qrcodeUrl, name string, positionId int64) ([]byte, error) {
+func GetPersonCode(positionId int64) string {
 	//根据职位id获取到对应的渠道码
 	code := ""
 	data := entity.JyBiTidb.FindOne("dwd_d_userbase_belongto_rulecode", map[string]interface{}{"position_id": positionId}, "code", "")
@@ -106,15 +106,20 @@ func PersonImgSaveComposite(fileUrl, qrcodeUrl, name string, positionId int64) (
 			"position_id": positionId,
 		})
 	}
+	return code
+}
+
+func PersonImgSaveComposite(fileUrl, qrcodeUrl, name, personCode string, positionId int64) ([]byte, error) {
+
 	//合成图片
 	ok, err := hasAnyParameters(qrcodeUrl)
 	if err != nil {
 		return nil, err
 	}
 	if ok {
-		qrcodeUrl = fmt.Sprintf("%s&personnelChannel=%s", qrcodeUrl, code)
+		qrcodeUrl = fmt.Sprintf("%s&personnelChannel=%s", qrcodeUrl, personCode)
 	} else {
-		qrcodeUrl = fmt.Sprintf("%s?personnelChannel=%s", qrcodeUrl, code)
+		qrcodeUrl = fmt.Sprintf("%s?personnelChannel=%s", qrcodeUrl, personCode)
 	}
 	log.Println("*********二维码图片链接：", qrcodeUrl)
 	err, imgByte := compositeImage(fileUrl, qrcodeUrl)