XMLWAN 3 лет назад
Родитель
Сommit
a4435cd7c5

+ 92 - 69
controllers/xcx_mobile_api_controller.go/xcx_api_controller.go Просмотреть файл

@@ -9,6 +9,7 @@ import (
9 9
 	"fmt"
10 10
 	"github.com/astaxie/beego"
11 11
 	"github.com/jinzhu/gorm"
12
+	"strconv"
12 13
 	"time"
13 14
 )
14 15
 
@@ -234,84 +235,106 @@ func (this *XcxApiController) GetScheduleInfo() {
234 235
 	timeLayout := "2006-01-02"
235 236
 	loc, _ := time.LoadLocation("Local")
236 237
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", weekMonday+" 00:00:00", loc)
237
-	//startTime, _ := time.ParseInLocation(timeLayout+"15:04:05", weekMonday+"00:00:00", loc)
238 238
 	fmt.Println("startiem", startTime)
239 239
 	endTime, _ := time.ParseInLocation(timeLayout+"15:04:05", weekDay+"00:00:00", loc)
240
-
241 240
 	fmt.Println(startTime.Unix(), endTime.Unix())
242
-
243 241
 	schedule, err := service.GetScheduleInfo(startTime.Unix(), endTime.Unix(), 1)
244 242
 	if err != nil {
245 243
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
246 244
 		return
247 245
 	}
248
-
246
+	var one = startTime.Unix() + 86400
247
+	fmt.Println("one2322332", one)
248
+	var two = one + 86400
249
+	var three = two + 86400
250
+	var four = three + 86400
251
+	var five = four + 86400
252
+	var six = five + 86400
253
+	var seven = six + 86400
254
+
255
+	var nextOne = seven + 86400
256
+	var nexttwo = nextOne + 86400
257
+	var nextthree = nexttwo + 86400
258
+	var nextfour = nextthree + 86400
259
+	var nextfive = nextfour + 86400
260
+	var nextsix = nextfive + 86400
261
+	var nextseven = nextsix + 86400
262
+
263
+	var lastOne = nextseven + 86400
264
+	var lastwo = lastOne + 86400
265
+	var lasthree = lastwo + 86400
266
+	var lastfour = lasthree + 86400
267
+	var lastfive = lastfour + 86400
268
+	var lastsix = lastfive + 86400
269
+	var lastseven = lastsix + 86400
270
+
271
+	fmt.Println("各地好当家232332323232", lastseven)
249 272
 	array := []interface{}{
250
-		map[string]string{"schedule_type": "1", "schedule_date": "1632067200", "schedule_week": "1", "mode_id": "", "name": ""},
251
-		map[string]string{"schedule_type": "2", "schedule_date": "1632067200", "schedule_week": "1", "mode_id": "", "name": ""},
252
-		map[string]string{"schedule_type": "3", "schedule_date": "1632067200", "schedule_week": "1", "mode_id": "", "name": ""},
253
-		map[string]string{"schedule_type": "1", "schedule_date": "1632153600", "schedule_week": "2", "mode_id": "", "name": ""},
254
-		map[string]string{"schedule_type": "2", "schedule_date": "1632153600", "schedule_week": "2", "mode_id": "", "name": ""},
255
-		map[string]string{"schedule_type": "3", "schedule_date": "1632153600", "schedule_week": "2", "mode_id": "", "name": ""},
256
-		map[string]string{"schedule_type": "1", "schedule_date": "1632240000", "schedule_week": "3", "mode_id": "", "name": ""},
257
-		map[string]string{"schedule_type": "2", "schedule_date": "1632240000", "schedule_week": "3", "mode_id": "", "name": ""},
258
-		map[string]string{"schedule_type": "3", "schedule_date": "1632240000", "schedule_week": "3", "mode_id": "", "name": ""},
259
-		map[string]string{"schedule_type": "1", "schedule_date": "1632240000", "schedule_week": "4", "mode_id": "", "name": ""},
260
-		map[string]string{"schedule_type": "2", "schedule_date": "1632326400", "schedule_week": "4", "mode_id": "", "name": ""},
261
-		map[string]string{"schedule_type": "3", "schedule_date": "1632326400", "schedule_week": "4", "mode_id": "", "name": ""},
262
-		map[string]string{"schedule_type": "1", "schedule_date": "1632326400", "schedule_week": "5", "mode_id": "", "name": ""},
263
-		map[string]string{"schedule_type": "2", "schedule_date": "1632412800", "schedule_week": "5", "mode_id": "", "name": ""},
264
-		map[string]string{"schedule_type": "3", "schedule_date": "1632412800", "schedule_week": "5", "mode_id": "", "name": ""},
265
-		map[string]string{"schedule_type": "1", "schedule_date": "1632412800", "schedule_week": "6", "mode_id": "", "name": ""},
266
-		map[string]string{"schedule_type": "2", "schedule_date": "1630684800", "schedule_week": "6", "mode_id": "", "name": ""},
267
-		map[string]string{"schedule_type": "3", "schedule_date": "1630684800", "schedule_week": "6", "mode_id": "", "name": ""},
268
-		map[string]string{"schedule_type": "1", "schedule_date": "1630771200", "schedule_week": "7", "mode_id": "", "name": ""},
269
-		map[string]string{"schedule_type": "2", "schedule_date": "1630771200", "schedule_week": "7", "mode_id": "", "name": ""},
270
-		map[string]string{"schedule_type": "3", "schedule_date": "1630771200", "schedule_week": "7", "mode_id": "", "name": ""},
271
-
272
-		map[string]string{"schedule_type": "1", "schedule_date": "1630857600", "schedule_week": "1", "mode_id": "", "name": ""},
273
-		map[string]string{"schedule_type": "2", "schedule_date": "1630857600", "schedule_week": "1", "mode_id": "", "name": ""},
274
-		map[string]string{"schedule_type": "3", "schedule_date": "1630857600", "schedule_week": "1", "mode_id": "", "name": ""},
275
-		map[string]string{"schedule_type": "1", "schedule_date": "1630944000", "schedule_week": "2", "mode_id": "", "name": ""},
276
-		map[string]string{"schedule_type": "2", "schedule_date": "1630944000", "schedule_week": "2", "mode_id": "", "name": ""},
277
-		map[string]string{"schedule_type": "3", "schedule_date": "1630944000", "schedule_week": "2", "mode_id": "", "name": ""},
278
-		map[string]string{"schedule_type": "1", "schedule_date": "1631030400", "schedule_week": "3", "mode_id": "", "name": ""},
279
-		map[string]string{"schedule_type": "2", "schedule_date": "1631030400", "schedule_week": "3", "mode_id": "", "name": ""},
280
-		map[string]string{"schedule_type": "3", "schedule_date": "1631030400", "schedule_week": "3", "mode_id": "", "name": ""},
281
-		map[string]string{"schedule_type": "1", "schedule_date": "1631116800", "schedule_week": "4", "mode_id": "", "name": ""},
282
-		map[string]string{"schedule_type": "2", "schedule_date": "1631116800", "schedule_week": "4", "mode_id": "", "name": ""},
283
-		map[string]string{"schedule_type": "3", "schedule_date": "1631116800", "schedule_week": "4", "mode_id": "", "name": ""},
284
-		map[string]string{"schedule_type": "1", "schedule_date": "1632499200", "schedule_week": "5", "mode_id": "", "name": ""},
285
-		map[string]string{"schedule_type": "2", "schedule_date": "1632499200", "schedule_week": "5", "mode_id": "", "name": ""},
286
-		map[string]string{"schedule_type": "3", "schedule_date": "1632499200", "schedule_week": "5", "mode_id": "", "name": ""},
287
-		map[string]string{"schedule_type": "1", "schedule_date": "1632585600", "schedule_week": "6", "mode_id": "", "name": ""},
288
-		map[string]string{"schedule_type": "2", "schedule_date": "1632585600", "schedule_week": "6", "mode_id": "", "name": ""},
289
-		map[string]string{"schedule_type": "3", "schedule_date": "1632585600", "schedule_week": "6", "mode_id": "", "name": ""},
290
-		map[string]string{"schedule_type": "1", "schedule_date": "1632672000", "schedule_week": "7", "mode_id": "", "name": ""},
291
-		map[string]string{"schedule_type": "2", "schedule_date": "1632672000", "schedule_week": "7", "mode_id": "", "name": ""},
292
-		map[string]string{"schedule_type": "3", "schedule_date": "1632672000", "schedule_week": "7", "mode_id": "", "name": ""},
293
-
294
-		map[string]string{"schedule_type": "1", "schedule_date": "1631462400", "schedule_week": "1", "mode_id": "", "name": ""},
295
-		map[string]string{"schedule_type": "2", "schedule_date": "1631462400", "schedule_week": "1", "mode_id": "", "name": ""},
296
-		map[string]string{"schedule_type": "3", "schedule_date": "1631462400", "schedule_week": "1", "mode_id": "", "name": ""},
297
-		map[string]string{"schedule_type": "1", "schedule_date": "1631548800", "schedule_week": "2", "mode_id": "", "name": ""},
298
-		map[string]string{"schedule_type": "2", "schedule_date": "1631548800", "schedule_week": "2", "mode_id": "", "name": ""},
299
-		map[string]string{"schedule_type": "3", "schedule_date": "1631548800", "schedule_week": "2", "mode_id": "", "name": ""},
300
-		map[string]string{"schedule_type": "1", "schedule_date": "1631635200", "schedule_week": "3", "mode_id": "", "name": ""},
301
-		map[string]string{"schedule_type": "2", "schedule_date": "1631635200", "schedule_week": "3", "mode_id": "", "name": ""},
302
-		map[string]string{"schedule_type": "3", "schedule_date": "1631635200", "schedule_week": "3", "mode_id": "", "name": ""},
303
-		map[string]string{"schedule_type": "1", "schedule_date": "1631721600", "schedule_week": "4", "mode_id": "", "name": ""},
304
-		map[string]string{"schedule_type": "2", "schedule_date": "1631721600", "schedule_week": "4", "mode_id": "", "name": ""},
305
-		map[string]string{"schedule_type": "3", "schedule_date": "1631721600", "schedule_week": "4", "mode_id": "", "name": ""},
306
-		map[string]string{"schedule_type": "1", "schedule_date": "1631808000", "schedule_week": "5", "mode_id": "", "name": ""},
307
-		map[string]string{"schedule_type": "2", "schedule_date": "1631808000", "schedule_week": "5", "mode_id": "", "name": ""},
308
-		map[string]string{"schedule_type": "3", "schedule_date": "1631808000", "schedule_week": "5", "mode_id": "", "name": ""},
309
-		map[string]string{"schedule_type": "1", "schedule_date": "1631894400", "schedule_week": "6", "mode_id": "", "name": ""},
310
-		map[string]string{"schedule_type": "2", "schedule_date": "1631894400", "schedule_week": "6", "mode_id": "", "name": ""},
311
-		map[string]string{"schedule_type": "3", "schedule_date": "1631894400", "schedule_week": "6", "mode_id": "", "name": ""},
312
-		map[string]string{"schedule_type": "1", "schedule_date": "1631980800", "schedule_week": "7", "mode_id": "", "name": ""},
313
-		map[string]string{"schedule_type": "2", "schedule_date": "1631980800", "schedule_week": "7", "mode_id": "", "name": ""},
314
-		map[string]string{"schedule_type": "3", "schedule_date": "1631980800", "schedule_week": "7", "mode_id": "", "name": ""},
273
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
274
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
275
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
276
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(two, 10), "schedule_week": "2", "mode_id": "", "name": ""},
277
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(two, 10), "schedule_week": "2", "mode_id": "", "name": ""},
278
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(two, 10), "schedule_week": "2", "mode_id": "", "name": ""},
279
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(three, 10), "schedule_week": "3", "mode_id": "", "name": ""},
280
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(three, 10), "schedule_week": "3", "mode_id": "", "name": ""},
281
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(three, 10), "schedule_week": "3", "mode_id": "", "name": ""},
282
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(four, 10), "schedule_week": "4", "mode_id": "", "name": ""},
283
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(four, 10), "schedule_week": "4", "mode_id": "", "name": ""},
284
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(four, 10), "schedule_week": "4", "mode_id": "", "name": ""},
285
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(five, 10), "schedule_week": "5", "mode_id": "", "name": ""},
286
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(five, 10), "schedule_week": "5", "mode_id": "", "name": ""},
287
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(five, 10), "schedule_week": "5", "mode_id": "", "name": ""},
288
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(six, 10), "schedule_week": "6", "mode_id": "", "name": ""},
289
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(six, 10), "schedule_week": "6", "mode_id": "", "name": ""},
290
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(six, 10), "schedule_week": "6", "mode_id": "", "name": ""},
291
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(seven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
292
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(seven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
293
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(seven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
294
+
295
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
296
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
297
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
298
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nexttwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
299
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nexttwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
300
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nexttwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
301
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
302
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
303
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
304
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
305
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
306
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
307
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
308
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
309
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
310
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
311
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
312
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
313
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(nextseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
314
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(nextseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
315
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(nextseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
316
+
317
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
318
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
319
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastOne, 10), "schedule_week": "1", "mode_id": "", "name": ""},
320
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
321
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
322
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastwo, 10), "schedule_week": "2", "mode_id": "", "name": ""},
323
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lasthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
324
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lasthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
325
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lasthree, 10), "schedule_week": "3", "mode_id": "", "name": ""},
326
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
327
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
328
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastfour, 10), "schedule_week": "4", "mode_id": "", "name": ""},
329
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
330
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
331
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastfive, 10), "schedule_week": "5", "mode_id": "", "name": ""},
332
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
333
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
334
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastsix, 10), "schedule_week": "6", "mode_id": "", "name": ""},
335
+		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(lastseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
336
+		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(lastseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
337
+		map[string]string{"schedule_type": "3", "schedule_date": strconv.FormatInt(lastseven, 10), "schedule_week": "7", "mode_id": "", "name": ""},
315 338
 	}
316 339
 	this.ServeSuccessJSON(map[string]interface{}{
317 340
 		"list":  schedule,

+ 0 - 4
service/xcx_mobile_api_service.go Просмотреть файл

@@ -107,12 +107,10 @@ func AesDecrypt(crypted, key, iv []byte) ([]byte, error) {
107 107
 
108 108
 func GetFirstDateOfWeek() (weekMonday string) {
109 109
 	now := time.Now()
110
-
111 110
 	offset := int(time.Monday - now.Weekday())
112 111
 	if offset > 0 {
113 112
 		offset = -6
114 113
 	}
115
-
116 114
 	weekStartDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
117 115
 	weekMonday = weekStartDate.Format("2006-01-02")
118 116
 	return
@@ -120,12 +118,10 @@ func GetFirstDateOfWeek() (weekMonday string) {
120 118
 
121 119
 func GetWeekDayOfWeek() (weekMonday string) {
122 120
 	now := time.Now()
123
-
124 121
 	offset := int(time.Monday - now.Weekday())
125 122
 	if offset > 0 {
126 123
 		offset = -6
127 124
 	}
128
-
129 125
 	weekStartDate := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
130 126
 	weekMonday = weekStartDate.Format("2006-01-02")
131 127
 	return