体积小

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"Xcx_New/models"
 	"Xcx_New/service"
 	"Xcx_New/utils"
+	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
@@ -26,7 +27,7 @@ func XcxApiControllersRegisterRouters() {
 	beego.Router("/xcx/api/mobile/patient", &XcxApiController{}, "Get:GetPatientList")
 
 	//获取登录后的信息
-	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Get:GetDataInfo")
+	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Post:GetDataInfo")
 
 	//获取排班数据
 	beego.Router("/xcx/api/mobile/schedule", &XcxApiController{}, "Get:GetScheduleInfo")
@@ -201,11 +202,18 @@ func (this *XcxApiController) GetPatientList() {
 }
 
 func (this *XcxApiController) GetDataInfo() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	appid := dataBody["appid"].(string)
+	key := dataBody["key"].(string)
+	iv := dataBody["iv"].(string)
+	encryptedData := dataBody["encryptedData"].(string)
 
-	appid := this.GetString("appid")
-	key := this.GetString("key")
-	iv := this.GetString("iv")
-	encryptedData := this.GetString("encryptedData")
 	list, err := service.DecryptData(appid, key, iv, encryptedData)
 	if err == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -219,12 +227,22 @@ func (this *XcxApiController) GetDataInfo() {
 
 func (this *XcxApiController) GetScheduleInfo() {
 	thisWeekMonday := service.GetFirstDateOfWeek()
-
+	weekDayWeek := service.GetWeekDayOfWeek()
 	TimeMonday, _ := time.Parse("2006-01-02", thisWeekMonday)
+	weekDays, _ := time.Parse("2006-01-02", weekDayWeek)
 	lastWeekMonday := TimeMonday.AddDate(0, 0, -7)
-	nextWeekMonday := TimeMonday.AddDate(0, 0, +7)
+	nextWeekMonday := weekDays.AddDate(0, 0, +13)
 	var weekMonday = lastWeekMonday.Format("2006-01-02")
 	var weekDay = nextWeekMonday.Format("2006-01-02")
 	fmt.Println("weekmodonday", weekMonday)
 	fmt.Println("nextweeekday", weekDay)
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", weekMonday+" 00:00:00", loc)
+
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", weekDay+" 00:00:00", loc)
+
+	fmt.Println(startTime.Unix(), endTime.Unix())
 }

service/xcx_mobile_api_service.go

@@ -120,6 +120,19 @@ func GetFirstDateOfWeek() (weekMonday string) {
 	return
 }
 
+func GetWeekDayOfWeek() (weekMonday string) {
+	now := time.Now()
+
+	offset := int(time.Monday - now.Weekday())
+	if offset > 0 {
+		offset = -6
+	}
+
+	weekStartDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	weekMonday = weekStartDate.Format("2006-01-02")
+	return
+}
+
 func GetMobilePatient(mobile string) (*models.XcxPatients, error) {
 
 	patient := models.XcxPatients{}