|
@@ -81,6 +81,8 @@ func processSpecTime(cabinetIds []int, specTime *model.SpecialTime, nowDataTime
|
|
|
isStart, isEnd, isWork bool
|
|
|
errs []error
|
|
|
execRes string
|
|
|
+ suc []int
|
|
|
+ fail []int
|
|
|
)
|
|
|
// 例外时间的开始时间=当前时间
|
|
|
if specTime.StartTimeStr == nowDataTime {
|
|
@@ -98,43 +100,41 @@ func processSpecTime(cabinetIds []int, specTime *model.SpecialTime, nowDataTime
|
|
|
if isStart {
|
|
|
if isWork {
|
|
|
// 开始时间 工作日 不允许开
|
|
|
- errs = DisableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = DisableCabinets(cabinetIds)
|
|
|
} else {
|
|
|
// 开始时间 非工作日 允许开
|
|
|
- errs = EnableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = EnableCabinets(cabinetIds)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if isEnd {
|
|
|
if isWork {
|
|
|
// 结束时间 工作日 允许开
|
|
|
- errs = EnableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = EnableCabinets(cabinetIds)
|
|
|
} else {
|
|
|
// 结束时间 非工作日 不允许开
|
|
|
- errs = DisableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = DisableCabinets(cabinetIds)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if len(errs) != 0 {
|
|
|
-
|
|
|
for _, err := range errs {
|
|
|
if err != nil {
|
|
|
- execRes = fmt.Sprintf("processSpecTime err.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,specTime.StartTimeStr:%s,nowDataTime:%s,specTime.WorkDay:%s,err:%s",
|
|
|
- isStart, isEnd, isWork, cabinetIds, specTime.StartTimeStr, nowDataTime, specTime.WorkDay, err.Error())
|
|
|
- log.Error(execRes)
|
|
|
+ log.Error(err.Error())
|
|
|
}
|
|
|
}
|
|
|
- return execRes
|
|
|
}
|
|
|
|
|
|
if isStart || isEnd {
|
|
|
- execRes = fmt.Sprintf("processSpecTime success.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,specTime.StartTimeStr:%s,nowDataTime:%s,specTime.WorkDay:%s",
|
|
|
- isStart, isEnd, isWork, cabinetIds, specTime.StartTimeStr, nowDataTime, specTime.WorkDay)
|
|
|
+ execRes = fmt.Sprintf("processSpecTime success.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,"+
|
|
|
+ "specTime.StartTimeStr:%s,nowDataTime:%s,specTime.WorkDay:%s,suc:%v,fail:%v", isStart, isEnd, isWork,
|
|
|
+ cabinetIds, specTime.StartTimeStr, nowDataTime, specTime.WorkDay, suc, fail)
|
|
|
|
|
|
return execRes
|
|
|
}
|
|
|
|
|
|
- execRes = fmt.Sprintf("processSpecTime do nothing.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,nowDataTime:%s", isStart, isEnd, isWork, cabinetIds, nowDataTime)
|
|
|
+ execRes = fmt.Sprintf("processSpecTime do nothing.isStart:%t,isEnd:%t,isWork:%t,"+
|
|
|
+ "cabinetIds:%v,nowDataTime:%s,,suc:%v,fail:%v", isStart, isEnd, isWork, cabinetIds, nowDataTime, suc, fail)
|
|
|
|
|
|
return execRes
|
|
|
}
|
|
@@ -145,6 +145,10 @@ func processWorkTime(cabinetIds []int, weekDay string, timeStr string) string {
|
|
|
var err error
|
|
|
var errs []error
|
|
|
var execRes string
|
|
|
+ var (
|
|
|
+ suc []int
|
|
|
+ fail []int
|
|
|
+ )
|
|
|
err = global.DB.Where("week_day like ?", weekDay+"%").Find(&workTimes).Error
|
|
|
if err != nil {
|
|
|
log.Error("find workTime err", zap.Error(err))
|
|
@@ -169,20 +173,20 @@ func processWorkTime(cabinetIds []int, weekDay string, timeStr string) string {
|
|
|
if isEnd {
|
|
|
if isWork {
|
|
|
// 结束时间 工作日 允许开
|
|
|
- errs = EnableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = EnableCabinets(cabinetIds)
|
|
|
} else {
|
|
|
// 结束时间 非工作日 不允许开
|
|
|
- errs = DisableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = DisableCabinets(cabinetIds)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if isStart {
|
|
|
if isWork {
|
|
|
// 开始时间 工作日 不允许开
|
|
|
- errs = DisableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = DisableCabinets(cabinetIds)
|
|
|
} else {
|
|
|
// 开始时间 非工作日 允许开
|
|
|
- errs = EnableCabinets(cabinetIds)
|
|
|
+ suc, fail, errs = EnableCabinets(cabinetIds)
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -190,40 +194,43 @@ func processWorkTime(cabinetIds []int, weekDay string, timeStr string) string {
|
|
|
if len(errs) != 0 {
|
|
|
for _, err := range errs {
|
|
|
if err != nil {
|
|
|
- execRes = fmt.Sprintf("processWorkTime err.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,weekDay:%s,timeStr:%s,err:%s",
|
|
|
- isStart, isEnd, isWork, cabinetIds, weekDay, timeStr, err.Error())
|
|
|
- log.Error(execRes)
|
|
|
- return execRes
|
|
|
+ log.Error(err.Error())
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if isStart || isEnd {
|
|
|
- execRes = fmt.Sprintf("processWorkTime success.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,weekDay:%s,timeStr:%s",
|
|
|
- isStart, isEnd, isWork, cabinetIds, weekDay, timeStr)
|
|
|
+ execRes = fmt.Sprintf("processWorkTime success.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,weekDay:%s,timeStr:%s,suc:%v,fail:%v",
|
|
|
+ isStart, isEnd, isWork, cabinetIds, weekDay, timeStr, suc, fail)
|
|
|
return execRes
|
|
|
}
|
|
|
- execRes = fmt.Sprintf("processWorkTime do nothing.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,weekDay:%s,timeStr:%s",
|
|
|
- isStart, isEnd, isWork, cabinetIds, weekDay, timeStr)
|
|
|
+ execRes = fmt.Sprintf("processWorkTime do nothing.isStart:%t,isEnd:%t,isWork:%t,cabinetIds:%v,weekDay:%s,timeStr:%s,suc:%v,fail:%v",
|
|
|
+ isStart, isEnd, isWork, cabinetIds, weekDay, timeStr, suc, fail)
|
|
|
|
|
|
return execRes
|
|
|
}
|
|
|
|
|
|
-func EnableCabinets(cabinetIds []int) (errs []error) {
|
|
|
+func EnableCabinets(cabinetIds []int) (suc []int, fail []int, errs []error) {
|
|
|
for _, cabinetId := range cabinetIds {
|
|
|
err := ServicesGroupApp.CabinetService.ChangeCabinetStatus(cabinetId, "允许开启")
|
|
|
if err != nil {
|
|
|
errs = append(errs, err)
|
|
|
+ fail = append(fail, cabinetId)
|
|
|
+ } else {
|
|
|
+ suc = append(suc, cabinetId)
|
|
|
}
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-func DisableCabinets(cabinetIds []int) (errs []error) {
|
|
|
+func DisableCabinets(cabinetIds []int) (suc []int, fail []int, errs []error) {
|
|
|
for _, cabinetId := range cabinetIds {
|
|
|
err := ServicesGroupApp.CabinetService.ChangeCabinetStatus(cabinetId, "禁止开启")
|
|
|
if err != nil {
|
|
|
errs = append(errs, err)
|
|
|
+ fail = append(fail, cabinetId)
|
|
|
+ } else {
|
|
|
+ suc = append(suc, cabinetId)
|
|
|
}
|
|
|
}
|
|
|
return
|