物料保存

rpc/etc/biservice.yaml

@@ -190,3 +190,4 @@ productArr:
 materialMsg:
   title: "您有1个宣传物料需要发布！"
   content: "%s给你分享了运营宣传物料，请及时处理。点击查看详情。"
+jyWebDomain: "https://jybx2-webtest.jydev.jianyu360.com"

rpc/internal/config/config.go

@@ -103,4 +103,5 @@ type Config struct {
 		Title   string
 		Content string
 	}
+	JyWebDomain string
 }

rpc/internal/logic/materialsavelogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jybase/encrypt"
 	"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"
@@ -43,7 +44,6 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 
 	//获取分发人的userid
 	userIdArr := service.GetSendUserId(in.ReceiveUserId, in.EntId)
-	log.Println("物料分发给：", userIdArr)
 	if in.QrcodeUrl == "" {
 		return &pb.MaterialSaveResp{
 			ErrorCode:  1,
@@ -58,16 +58,16 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 		if len(strings.Split(in.FileUrl, ",")) == 0 {
 			break
 		}
-		personCode := service.GetPersonCode(gconv.Int64(positionArr[k]))
+		personCode := service.GetPersonCode(gconv.Int64(positionArr[k]), v)
+		qrcodeUrl := fmt.Sprintf("%s/material/%s/%s", IC.IC.JyWebDomain, encrypt.SE.EncodeString(gconv.String(mid)), personCode)
+		//log.Println("二维码链接", qrcodeUrl)
 		for _, val := range strings.Split(in.FileUrl, ",") {
 			go func(fileUrl, name string, positionId int64) {
-				imgByte, err := service.PersonImgSaveComposite(fileUrl, in.QrcodeUrl, name, personCode, positionId)
-				log.Println(imgByte)
+				err, imgByte := service.CompositeImage(fileUrl, qrcodeUrl)
 				if err != nil {
-					log.Println("合成图片出错：", err)
+					log.Println("合成图片出错：", positionId, fileUrl, err)
 					return
 				}
-				log.Println("图片名称", path.Base(fileUrl))
 				up, err := entity.FileCenterRpc.Upload(context.Background(), &fpb.UploadReq{
 					File:           imgByte,
 					OssBucketName:  entity.OssBucketName,
@@ -75,14 +75,13 @@ func (l *MaterialSaveLogic) MaterialSave(in *pb.MaterialSaveReq) (*pb.MaterialSa
 					Name:           path.Base(fileUrl),
 					NeedEncryption: false,
 				})
-				//log.Println(err)
 				if up == nil || up.Url == "" {
-					log.Println("上传合成图片失败：", err)
+					log.Println("上传合成图片失败：", positionId, err)
 					return
 				}
 				ok := service.PersonImageSave(up.Url, msgId, positionId, mid)
 				if !ok {
-					log.Println("合成图片存库失败")
+					log.Println("合成图片存库失败", positionId, mid)
 					return
 				}
 			}(val, v, gconv.Int64(positionArr[k]))

service/compositeImages.go

@@ -17,7 +17,7 @@ import (
 	"net/http"
 )
 
-func compositeImage(backgroundURL, qrContent string) (err error, imgByte []byte) {
+func CompositeImage(backgroundURL, qrContent string) (err error, imgByte []byte) {
 	// 配置参数
 	//backgroundURL := "https://images.unsplash.com/photo-1501854140801-50d01698950b" // 示例背景图片
 	//qrContent := "https://github.com/zeromicro/go-zero"                           // 二维码内容

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 GetPersonCode(positionId int64) string {
+func GetPersonCode(positionId int64, name string) string {
 	//根据职位id获取到对应的渠道码
 	code := ""
 	data := entity.JyBiTidb.FindOne("dwd_d_userbase_belongto_rulecode", map[string]interface{}{"position_id": positionId}, "code", "")
@@ -109,7 +109,7 @@ func GetPersonCode(positionId int64) string {
 	return code
 }
 
-func PersonImgSaveComposite(fileUrl, qrcodeUrl, name, personCode string, positionId int64) ([]byte, error) {
+/*func PersonImgSaveComposite(fileUrl, qrcodeUrl, name, personCode string, positionId int64) ([]byte, error) {
 
 	//合成图片
 	ok, err := hasAnyParameters(qrcodeUrl)
@@ -121,10 +121,9 @@ func PersonImgSaveComposite(fileUrl, qrcodeUrl, name, personCode string, positio
 	} else {
 		qrcodeUrl = fmt.Sprintf("%s?personnelChannel=%s", qrcodeUrl, personCode)
 	}
-	log.Println("*********二维码图片链接：", qrcodeUrl)
-	err, imgByte := compositeImage(fileUrl, qrcodeUrl)
+	err, imgByte := CompositeImage(fileUrl, qrcodeUrl)
 	return imgByte, err
-}
+}*/
 
 func generateRandomString(length int) string {
 	const charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"