fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev

Browse Source
This commit is contained in:
戴育兵 2025-10-23 16:51:37 +08:00
commit 3119718387
7 changed files with 1412 additions and 1379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2691
api/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

2
docs/dev/dubbogo.yaml
View File

@ -4,7 +4,7 @@ dubbo:
protocol: zookeeper protocol: zookeeper
timeout: 3s timeout: 3s
# address: 121.229.45.214:9004 # address: 121.229.45.214:9004
address: 127.0.0.1:2181 address: zookeeper:2181
# address: 127.0.0.1:2181 # address: 127.0.0.1:2181
# address: 114.218.158.24:2181 # address: 114.218.158.24:2181
consumer: consumer:

2
docs/test/conf.ini
View File

@ -28,7 +28,7 @@ CdnHost = "OSS_CDN"
[redis] [redis]
RedisDB = "2" RedisDB = "2"
RedisAddr = "172.16.100.114:6379" RedisAddr = "svc-fontree-redis-service:6379"
RedisPW = "kP6tW4tS3qB2dW4aE6uI5cX2" RedisPW = "kP6tW4tS3qB2dW4aE6uI5cX2"
RedisDBNAme = "2" RedisDBNAme = "2"

2
docs/test/dubbogo.yaml
View File

@ -4,7 +4,7 @@ dubbo:
protocol: zookeeper protocol: zookeeper
timeout: 3s timeout: 3s
# address: 121.229.45.214:9004 # address: 121.229.45.214:9004
address: 172.16.100.93:2181 address: zookeeper:2181
# address: 127.0.0.1:2181 # address: 127.0.0.1:2181
# address: 114.218.158.24:2181 # address: 114.218.158.24:2181
consumer: consumer:

1
pkg/service/bundle/bundleBalance.go
View File

@ -449,7 +449,6 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
func GetAccountBundleBalance(c *gin.Context) { func GetAccountBundleBalance(c *gin.Context) {
var req bundle.GetBundleBalanceListReq var req bundle.GetBundleBalanceListReq
req.Month = time.Now().Format("2006-01")
if err := c.ShouldBindJSON(&req); err != nil { if err := c.ShouldBindJSON(&req); err != nil {
service.Error(c, err) service.Error(c, err)
return return

78
pkg/service/cast/work.go
View File

@ -63,24 +63,27 @@ func UpdateWorkImage(ctx *gin.Context) {
return return
} }
// 更新任务台的任务数量，调用员工实际任务状态更新 // 产品暂时关闭从其他入口发布，扣减任务台的数量的功能
if service.BundleProvider != nil { // // EmployeeName 和 EmployeeNum 从 token 中获取
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ // userInfo := login.GetUserInfoFromC(ctx)
AssignRecordsUUID: "", // // 更新任务台的任务数量，调用员工实际任务状态更新
EmployeeName: infoResp.Name, // if service.BundleProvider != nil {
EmployeeNum: infoResp.TelNum, // resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
TaskType: "post", // AssignRecordsUUID: "",
CompleteCount: 1, // EmployeeName: userInfo.Name,
}) // EmployeeNum: userInfo.TelNum,
if err != nil { // TaskType: "post",
zap.L().Error("UpdateTaskProgress failed", zap.Error(err)) // CompleteCount: 1,
// 不直接返回错误，允许主要功能继续执行 // })
} else { // if err != nil {
zap.L().Info("UpdateTaskProgress", zap.Any("resp", resp1)) // zap.L().Error("UpdateTaskProgress failed", zap.Error(err))
} // // 不直接返回错误，允许主要功能继续执行
} else { // } else {
zap.L().Warn("BundleProvider is nil, skipping UpdateTaskProgress") // zap.L().Info("UpdateTaskProgress", zap.Any("resp", resp1))
} // }
// } else {
// zap.L().Warn("BundleProvider is nil, skipping UpdateTaskProgress")
// }
service.Success(ctx, resp) service.Success(ctx, resp)
return return
} }
@ -128,24 +131,27 @@ func UpdateWorkVideo(ctx *gin.Context) {
return return
} }
// 更新任务台的任务数量，调用员工实际任务状态更新 // 产品暂时关闭从其他入口发布，扣减任务台的数量的功能
if service.BundleProvider != nil { // // EmployeeName 和 EmployeeNum 从 token 中获取
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ // userInfo := login.GetUserInfoFromC(ctx)
AssignRecordsUUID: "", // // 更新任务台的任务数量，调用员工实际任务状态更新
EmployeeName: infoResp.Name, // if service.BundleProvider != nil {
EmployeeNum: infoResp.TelNum, // resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
TaskType: "video", // AssignRecordsUUID: "",
CompleteCount: 1, // EmployeeName: userInfo.Name,
}) // EmployeeNum: userInfo.TelNum,
if err != nil { // TaskType: "video",
zap.L().Error("UpdateTaskProgress failed", zap.Error(err)) // CompleteCount: 1,
// 不直接返回错误，允许主要功能继续执行 // })
} else { // if err != nil {
zap.L().Info("UpdateTaskProgress", zap.Any("resp", resp1)) // zap.L().Error("UpdateTaskProgress failed", zap.Error(err))
} // // 不直接返回错误，允许主要功能继续执行
} else { // } else {
zap.L().Warn("BundleProvider is nil, skipping UpdateTaskProgress") // zap.L().Info("UpdateTaskProgress", zap.Any("resp", resp1))
} // }
// } else {
// zap.L().Warn("BundleProvider is nil, skipping UpdateTaskProgress")
// }
service.Success(ctx, resp) service.Success(ctx, resp)
return return
} }

15
pkg/service/taskbench/taskBench.go
View File

@ -61,6 +61,9 @@ func UpdatePendingCount(c *gin.Context) {
service.Error(c, err) service.Error(c, err)
return return
} }
userInfo := login.GetUserInfoFromC(c)
req.OperatorNum = userInfo.TelNum
req.Operator = userInfo.Name
res, err := service.BundleProvider.UpdatePendingCount(context.Background(), &req) res, err := service.BundleProvider.UpdatePendingCount(context.Background(), &req)
if err != nil { if err != nil {
@ -219,11 +222,13 @@ func UpdateWorkImageWithTaskUUID(ctx *gin.Context) {
service.Error(ctx, err) service.Error(ctx, err)
return return
} }
// EmployeeName 和 EmployeeNum 从 toekn 里面拿
userInfo := login.GetUserInfoFromC(ctx)
// 调用员工实际任务状态更新 // 调用员工实际任务状态更新
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: req.AssignRecordsUUID, AssignRecordsUUID: req.AssignRecordsUUID,
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, // 需要根据实际业务逻辑填充员工工号 EmployeeNum: userInfo.TelNum, // 需要根据实际业务逻辑填充员工工号
TaskType: "post", TaskType: "post",
CompleteCount: 1, CompleteCount: 1,
}) })
@ -276,11 +281,13 @@ func UpdateWorkVideoWithUUID(ctx *gin.Context) {
service.Error(ctx, err) service.Error(ctx, err)
return return
} }
// EmployeeName 和 EmployeeNum 从 toekn 里面拿
userInfo := login.GetUserInfoFromC(ctx)
// 调用员工实际任务状态更新 // 调用员工实际任务状态更新
resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{ resp1, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &bundle.UpdateTaskProgressRequest{
AssignRecordsUUID: req.AssignRecordsUUID, AssignRecordsUUID: req.AssignRecordsUUID,
EmployeeName: infoResp.Name, EmployeeName: userInfo.Name,
EmployeeNum: infoResp.TelNum, // 需要根据实际业务逻辑填充员工工号 EmployeeNum: userInfo.TelNum, // 需要根据实际业务逻辑填充员工工号
TaskType: "video", TaskType: "video",
CompleteCount: 1, CompleteCount: 1,
}) })