瀏覽代碼

物料保存

renjiaojiao 3 周之前
父節點
當前提交
43a764970f
共有 3 個文件被更改,包括 132 次插入9 次删除
  1. 9 9
      api/internal/svc/servicecontext.go
  2. 51 0
      rpc/internal/logic/materialsavelogic.go
  3. 72 0
      service/material.go

+ 9 - 9
api/internal/svc/servicecontext.go

@@ -24,23 +24,23 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		BiServiceRpc: biservice.NewBiService(zrpc.MustNewClient(c.BiServiceRpc)),
 		ResourceCenterRpc: resource.NewResource(zrpc.MustNewClient(zrpc.RpcClientConf{
 			Etcd: discov.EtcdConf{
-				//Hosts: c.BiServiceRpc.Etcd.Hosts,
-				Hosts: []string{"172.31.31.205:2379"},
-				Key:   c.ResourceCenterKey,
+				Hosts: c.BiServiceRpc.Etcd.Hosts,
+				//Hosts: []string{"172.31.31.205:2379"},
+				Key: c.ResourceCenterKey,
 			},
 		})),
 		UserCenterRpc: usercenter.NewUserCenter(zrpc.MustNewClient(zrpc.RpcClientConf{
 			Etcd: discov.EtcdConf{
-				//Hosts: c.BiServiceRpc.Etcd.Hosts,
-				Hosts: []string{"172.31.31.205:2379"},
-				Key:   c.UserCenterKey,
+				Hosts: c.BiServiceRpc.Etcd.Hosts,
+				//Hosts: []string{"172.31.31.205:2379"},
+				Key: c.UserCenterKey,
 			},
 		})),
 		MessageCenterRpc: messageclient.NewMessage(zrpc.MustNewClient(zrpc.RpcClientConf{
 			Etcd: discov.EtcdConf{
-				//Hosts: c.BiServiceRpc.Etcd.Hosts,
-				Hosts: []string{"172.31.31.205:2379"},
-				Key:   c.MessageCenterKey,
+				Hosts: c.BiServiceRpc.Etcd.Hosts,
+				//Hosts: []string{"172.31.31.205:2379"},
+				Key: c.MessageCenterKey,
 			},
 		})),
 	}

+ 51 - 0
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,6 +44,52 @@ 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,
+			ErrorMsg:   "",
+			MsgId:      msgId,
+			MaterialId: mid,
+			UserIdArr:  userIdArr,
+		}, nil
+	}
+	positionArr := strings.Split(in.ReceiveUserId, ",")
+	for k, v := range strings.Split(in.ReceiveUserName, ",") {
+		if len(strings.Split(in.FileUrl, ",")) == 0 {
+			break
+		}
+		for _, val := range strings.Split(in.FileUrl, ",") {
+			go func(fileUrl, name string, positionId int64) {
+				imgByte, err := service.PersonImgSaveComposite(fileUrl, in.QrcodeUrl, name, positionId)
+				if err != nil {
+					log.Println("合成图片出错:", err)
+					return
+				}
+				up, err := entity.FileCenterRpc.Upload(l.ctx, &fpb.UploadReq{
+					File:           imgByte,
+					OssBucketName:  entity.OssBucketName,
+					OssUrl:         entity.OssUrl,
+					Name:           path.Base(in.FileUrl),
+					NeedEncryption: false,
+				})
+				if up == nil || up.Url == "" {
+					log.Println("上传合成图片失败:", err)
+					return
+				}
+				//key := up.Key
+				//ossAddr = gconv.String(Ret["downUrl"])
+				/*log.Println("url", up.Url)
+				fileName := filepath.Base(up.Url)
+				downUrl := fmt.Sprintf("%s/jyoss/ml/attachment/%s", IC.IC.JyWebDomain, fileName)
+				log.Println("downUrl:", downUrl)*/
+				ok := service.PersonImageSave(up.Url, msgId, positionId, mid)
+				if !ok {
+					log.Println("合成图片存库失败")
+					return
+				}
+			}(val, v, gconv.Int64(positionArr[k]))
+		}
+	}
 
 	return &pb.MaterialSaveResp{
 		ErrorCode:  1,

+ 72 - 0
service/material.go

@@ -4,10 +4,13 @@ import (
 	"app.yhyue.com/moapp/jybase/date"
 	entity "bp.jydev.jianyu360.cn/BaseService/biService/entity"
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/pb"
+	"crypto/rand"
 	"errors"
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	"log"
+	"math/big"
+	"net/url"
 	"strings"
 	"time"
 )
@@ -69,3 +72,72 @@ func GetSendUserId(positionIds string, entId int64) []string {
 	}
 	return userIdArr
 }
+
+func PersonImageSave(imgUrl string, msgId, positionId, materialsId int64) bool {
+	saveMap := map[string]interface{}{
+		"file_url":     imgUrl,
+		"msg_id":       msgId,
+		"position_id":  positionId,
+		"materials_id": materialsId,
+		"createtime":   time.Now().Format(date.Date_Full_Layout),
+	}
+	return entity.BiService.Insert("operating_materials_attachment", saveMap) > 0
+}
+
+func PersonImgSaveComposite(fileUrl, qrcodeUrl, name string, positionId int64) ([]byte, error) {
+	//根据职位id获取到对应的渠道码
+	code := ""
+	data := entity.JyBiTidb.FindOne("dwd_d_userbase_belongto_rulecode", map[string]interface{}{"position_id": positionId}, "code", "")
+	if data != nil && len(*data) > 0 {
+		code = gconv.String((*data)["code"])
+	} else {
+		//没有code,生成一个
+		code = generateRandomString(6)
+		entity.JyBiMysql.Insert("dwd_d_userbase_belongto_rulecode", map[string]interface{}{
+			"code":        code,
+			"pcode":       "04",
+			"level":       "2",
+			"name":        "",
+			"remark":      "人员渠道码",
+			"SZ_LEVEL":    1,
+			"SZ_LEAF":     1,
+			"SZ_PID0":     "04",
+			"SZ_PID1":     code,
+			"position_id": positionId,
+		})
+	}
+	//合成图片
+	ok, err := hasAnyParameters(qrcodeUrl)
+	if err != nil {
+		return nil, err
+	}
+	if ok {
+		qrcodeUrl = fmt.Sprintf("%s&personnelChannel=%s", qrcodeUrl, code)
+	} else {
+		qrcodeUrl = fmt.Sprintf("%s?personnelChannel=%s", qrcodeUrl, code)
+	}
+	log.Println("*********二维码图片链接:", qrcodeUrl)
+	err, imgByte := compositeImage(fileUrl, qrcodeUrl)
+	return imgByte, err
+}
+
+func generateRandomString(length int) string {
+	const charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+	b := make([]byte, length)
+	for i := range b {
+		// 安全地生成随机索引 (0 到 len(charset)-1)
+		idx, _ := rand.Int(rand.Reader, big.NewInt(int64(len(charset))))
+		b[i] = charset[idx.Int64()]
+	}
+	return string(b)
+}
+
+func hasAnyParameters(rawURL string) (bool, error) {
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		return false, err
+	}
+
+	// 检查查询参数或片段标识符中的参数
+	return parsedURL.RawQuery != "" || (parsedURL.Fragment != "" && strings.Contains(parsedURL.Fragment, "=")), nil
+}