From 4fdbec0379f2d2a2c3332e89b4d783175882d6d3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 15:56:52 +0800
Subject: [PATCH] 条形码用字符串
---
model/report_work.go | 2 +-
service/report_work.go | 2 +-
pkg/snowflake/snowflake.go | 10 ++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/model/report_work.go b/model/report_work.go
index 99ffc26..379c664 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -22,7 +22,7 @@
WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
WorkerTime int64 `json:"workerTime"` //宸ユ椂锛屽崟浣嶇
- BarCode int64 `json:"barCode"` //鏉″舰鐮�
+ BarCode string `json:"barCode"` //鏉″舰鐮�
}
ReportWorkSearch struct {
diff --git a/pkg/snowflake/snowflake.go b/pkg/snowflake/snowflake.go
index 2baf9ca..ad86994 100644
--- a/pkg/snowflake/snowflake.go
+++ b/pkg/snowflake/snowflake.go
@@ -2,6 +2,7 @@
import (
"errors"
+ "strconv"
"sync"
"time"
)
@@ -106,3 +107,12 @@
}
return id
}
+
+func GenerateIdStr() string {
+start:
+ id, err := idGenerater.NextId()
+ if err != nil {
+ goto start
+ }
+ return strconv.FormatInt(id, 10)
+}
diff --git a/service/report_work.go b/service/report_work.go
index 5e7c8a9..68d1117 100644
--- a/service/report_work.go
+++ b/service/report_work.go
@@ -62,7 +62,7 @@
WorkerID: params.WorkerID,
WorkerName: workerName,
WorkerTime: nowTs - startTs,
- BarCode: snowflake.GenerateId(),
+ BarCode: snowflake.GenerateIdStr(),
}
err = model.NewReportWorkSearch(nil).Create(record)
--
Gitblit v1.8.0