From ad5a9273b2ccf5abb8741fdda8627baf93f9fd09 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 9 Sep 2024 09:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/System.go | 29 +++++++++++++++++++++++++++--
 api/requests/System.go   |  6 ++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/api/controller/System.go b/api/controller/System.go
index bfa99bd..03a3566 100644
--- a/api/controller/System.go
+++ b/api/controller/System.go
@@ -3,8 +3,10 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"strconv"
+	"time"
 	"vote-admin-api/api/dao"
 	"vote-admin-api/api/dto"
+	"vote-admin-api/api/model"
 	"vote-admin-api/api/requests"
 	"vote-admin-api/api/responses"
 	"vote-admin-api/global"
@@ -81,11 +83,34 @@ func (b *System) PutSystemTime(c *gin.Context) {
 	// 修改值
 	systemTimeData := make(map[string]interface{})
 
-	if req.StartTime != systemTime.StartTime {
+	// 获取本地时区
+	location, err := time.LoadLocation("Local")
+	if err != nil {
+		responses.FailWithMessage("修改失败", c)
+		return
+	}
+
+	t, err := time.ParseInLocation("2006-01-02 15:04:05", req.StartTime, location)
+	if err != nil {
+		responses.FailWithMessage("修改失败", c)
+		return
+	}
+
+	startTime := model.LocalTime(t)
+
+	if &startTime != systemTime.StartTime {
 		systemTimeData["start_time"] = req.StartTime
 	}
 
-	if req.EndTime != systemTime.EndTime {
+	t, err = time.ParseInLocation("2006-01-02 15:04:05", req.EndTime, location)
+	if err != nil {
+		responses.FailWithMessage("修改失败", c)
+		return
+	}
+
+	endTime := model.LocalTime(t)
+
+	if &endTime != systemTime.EndTime {
 		systemTimeData["end_time"] = req.EndTime
 	}
 
diff --git a/api/requests/System.go b/api/requests/System.go
index 45d8059..c1b4d61 100644
--- a/api/requests/System.go
+++ b/api/requests/System.go
@@ -1,13 +1,11 @@
 package requests
 
-import "vote-admin-api/api/model"
-
 type SystemRequest struct {
 	PutSystemTime // 修改投票时间
 }
 
 // PutSystemTime 修改投票时间
 type PutSystemTime struct {
-	StartTime *model.LocalTime `json:"start_time" form:"start_time" label:"开始投票时间" validate:"required"`
-	EndTime   *model.LocalTime `json:"end_time" form:"end_time" label:"结束投票时间" validate:"required"`
+	StartTime string `json:"start_time" form:"start_time" label:"开始投票时间" validate:"required"`
+	EndTime   string `json:"end_time" form:"end_time" label:"结束投票时间" validate:"required"`
 }