修改minetime接口 ticketinfo接口

routers/api/v1/pai.go

@@ -71,7 +71,7 @@ func RecordMineTime(c *gin.Context) {
 		appG.Response(http.StatusOK, e.ERROR, nil)
 	}
 	var stat stat_service.RaspMinerStat
-	err = stat.SetMineTime(req.Addr,req.StartTime,req.EndTime)
+	err = stat.SetMineTime(req.Addr,req.Flag)
 	if err != nil {
 		logging.Error("GetTicketInfo err",err)
 		appG.Response(http.StatusOK, e.ERROR, nil)

routers/router.go

@@ -12,7 +12,7 @@ func InitRouter() *gin.Engine {
 	r := gin.Default()
 	r.Use(gin.Logger())
 	r.Use(gin.Recovery())
-
+	r.Use(Cors())
 	//r.StaticFS("/export", http.Dir(export.GetExcelFullPath()))
 	//r.StaticFS("/upload/images", http.Dir(upload.GetImageFullPath()))
 	//r.StaticFS("/qrcode", http.Dir(qrcode.GetQrCodeFullPath()))
@@ -22,7 +22,7 @@ func InitRouter() *gin.Engine {
 	//r.POST("/upload", api.UploadImage)
 	apiv1 := r.Group("/pai")
 	//获取树莓派基本信息
-	apiv1.Any("",Cors())
+	//apiv1.Any("",Cors())
 	apiv1.POST("/ticketinfo",v1.GetTicketInfo)
 	apiv1.POST("/minetime",v1.RecordMineTime)
 	//apiv1.Use(jwt.JWT())

service/pai_service/pai.go

@@ -10,6 +10,7 @@ import (
 	"chain33-pai/pkg/logging"
 	"github.com/33cn/chain33/types"
 	"chain33-pai/models"
+	"time"
 )
 
 var (
@@ -34,6 +35,7 @@ type MinedInfo struct {
 	MiningTicketCount int64 `json:"mining_ticket_count"`
 	MinerStartTime int64 `json:"miner_start_time"`
 	MinerEndTime int64 `json:"miner_end_time"`
+	ServeTime int64 `json:"serve_time"`
 	MinedList []*MinedTxInfo `json:"mined_list"`
 }
 
@@ -54,8 +56,7 @@ type ReqTicketInfo struct {
 
 type ReqMineTime struct {
 	Addr string `json:"addr" validate:"requried"`
-	StartTime int64 `json:"start_time"`
-	EndTime int64 `json:"end_time"`
+	Flag string `json:"flag"`
 }
 
 func (p *Pai) GetConfig() bool {
@@ -184,6 +185,7 @@ func (p *Pai) GetTicketInfo(req *ReqTicketInfo) (*MinedInfo,error) {
 	info.MiningTicketCount = stat.MiningTicketCount
 	info.MinerStartTime = stat.MinerStartTime
 	info.MinerEndTime = stat.MinerEndTime
+	info.ServeTime = time.Now().Unix()
 	info.MinedList = txsList
 	return &info,nil
 }
\ No newline at end of file

service/stat_service/rasp_miner_stat.go

@@ -2,6 +2,7 @@ package stat_service
 
 import (
 	"chain33-pai/models"
+	"time"
 )
 
 type RaspMinerStat struct {
@@ -15,19 +16,17 @@ func (s *RaspMinerStat) GetMinerStat(addr string) (*models.RaspMinerStat,error)
 	return  models.GetAddr(addr)
 }
 
-func (s *RaspMinerStat) SetMineTime(addr string,start ,end int64) error {
-	stat,err := models.GetAddr(addr)
+func (s *RaspMinerStat) SetMineTime(addr string,flag string) error {
+	_,err := models.GetAddr(addr)
 	if err != nil {
 		return err
 	}
-	m := map[string]interface{}{"miner_start_time":start,"miner_end_time":end}
-	if stat.MinerStartTime <= 0 {
-		m["miner_start_time"] = start
-		m["miner_end_time"] = 0
+	m := map[string]interface{}{"miner_start_time":0,"miner_end_time":0}
+	if flag == "start" {
+		m["miner_start_time"] = time.Now().Unix()
 	}
-	if stat.MinerStartTime > 0 && stat.MinerEndTime <= 0 {
-		m["miner_start_time"] = stat.MinerStartTime
-		m["miner_end_time"] = end
+	if flag == "end" {
+		m["miner_start_time"] = time.Now().Unix()
 	}
 
 	return models.EditAddr(addr,m)