Browse Source

停掉所有的定时任务

Rick.Lan 4 weeks ago
parent
commit
8ba22e9984

+ 3 - 0
.gitignore View File

1
+Xcx_New
2
+.vscode/launch.json
3
+go.sum

+ 2 - 2
conf/app.conf View File

1
 appname = 小程序
1
 appname = 小程序
2
-httpport = 9539
3
-runmode = prod
2
+httpport = 9538
3
+runmode = dev
4
 
4
 
5
 #
5
 #
6
 copyrequestbody = true
6
 copyrequestbody = true

+ 8 - 7
controllers/his_api_controller.go View File

1
 package controllers
1
 package controllers
2
 
2
 
3
-import "C"
3
+//import "C"
4
 import (
4
 import (
5
 	"Xcx_New/enums"
5
 	"Xcx_New/enums"
6
 	"Xcx_New/models"
6
 	"Xcx_New/models"
8
 	"Xcx_New/utils"
8
 	"Xcx_New/utils"
9
 	"encoding/json"
9
 	"encoding/json"
10
 	"fmt"
10
 	"fmt"
11
-	"github.com/astaxie/beego"
12
-	"github.com/jinzhu/gorm"
13
-	"github.com/shopspring/decimal"
14
 	"math/rand"
11
 	"math/rand"
15
 	"reflect"
12
 	"reflect"
16
 	"strconv"
13
 	"strconv"
18
 	"syscall"
15
 	"syscall"
19
 	"time"
16
 	"time"
20
 	"unsafe"
17
 	"unsafe"
18
+
19
+	"github.com/astaxie/beego"
20
+	"github.com/jinzhu/gorm"
21
+	"github.com/shopspring/decimal"
21
 )
22
 )
22
 
23
 
23
 type HisApiController struct {
24
 type HisApiController struct {
2745
 	ItemId           int64
2746
 	ItemId           int64
2746
 }
2747
 }
2747
 
2748
 
2748
-//获取个人信息----挂号-----上传就诊信息
2749
+// 获取个人信息----挂号-----上传就诊信息
2749
 func (c *HisApiController) GetRegisterInfo() {
2750
 func (c *HisApiController) GetRegisterInfo() {
2750
 	id, _ := c.GetInt64("id")
2751
 	id, _ := c.GetInt64("id")
2751
 	record_time := c.GetString("record_time")
2752
 	record_time := c.GetString("record_time")
2916
 
2917
 
2917
 }
2918
 }
2918
 
2919
 
2919
-//上传明细----结算
2920
+// 上传明细----结算
2920
 func (c *HisApiController) GetUploadInfo() {
2921
 func (c *HisApiController) GetUploadInfo() {
2921
 	id, _ := c.GetInt64("id")
2922
 	id, _ := c.GetInt64("id")
2922
 	record_time := c.GetString("record_time")
2923
 	record_time := c.GetString("record_time")
3199
 	}
3200
 	}
3200
 }
3201
 }
3201
 
3202
 
3202
-//退款
3203
+// 退款
3203
 func (c *HisApiController) Refund() {
3204
 func (c *HisApiController) Refund() {
3204
 	order_id, _ := c.GetInt64("order_id")
3205
 	order_id, _ := c.GetInt64("order_id")
3205
 	order, _ := service.GetHisOrderByID(order_id)
3206
 	order, _ := service.GetHisOrderByID(order_id)

+ 8 - 8
models/service/auto_clear_schedules_service.go View File

11
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
11
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
12
 var clearSchedulesCronJob *cron.Cron
12
 var clearSchedulesCronJob *cron.Cron
13
 
13
 
14
-func init() {
15
-	utils.InfoLog("开启自动清除排班定时任务")
16
-	clearSchedulesCronJob = cron.New()
17
-	spec := "0 0 1 * * ?" // 每天凌晨1点清除已排班未上机的排班数据
18
-	clearSchedulesCronJob.AddFunc(spec, func() {
19
-		AutoClearSchedules()
20
-	})
21
-}
14
+// func init() {
15
+// 	utils.InfoLog("开启自动清除排班定时任务")
16
+// 	clearSchedulesCronJob = cron.New()
17
+// 	spec := "0 0 1 * * ?" // 每天凌晨1点清除已排班未上机的排班数据
18
+// 	clearSchedulesCronJob.AddFunc(spec, func() {
19
+// 		AutoClearSchedules()
20
+// 	})
21
+// }
22
 
22
 
23
 func BeginAutoClearSchedulesJob() {
23
 func BeginAutoClearSchedulesJob() {
24
 	clearSchedulesCronJob.Start()
24
 	clearSchedulesCronJob.Start()

+ 11 - 10
models/service/auto_create_staff_schedule_service.go View File

3
 import (
3
 import (
4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"fmt"
5
 	"fmt"
6
+	"time"
7
+
6
 	"github.com/jinzhu/gorm"
8
 	"github.com/jinzhu/gorm"
7
 	"github.com/robfig/cron"
9
 	"github.com/robfig/cron"
8
-	"time"
9
 )
10
 )
10
 
11
 
11
 //// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
12
 //// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
32
 
33
 
33
 var createStaffScheduleCronJob *cron.Cron
34
 var createStaffScheduleCronJob *cron.Cron
34
 
35
 
35
-func init() {
36
-	createStaffScheduleCronJob = cron.New()
37
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
38
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
39
-	spec := "0 0 0 ? * Sun"
40
-	createStaffScheduleCronJob.AddFunc(spec, func() {
41
-		AutoCreateStaffScheduleJob()
42
-	})
43
-}
36
+// func init() {
37
+// 	createStaffScheduleCronJob = cron.New()
38
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
39
+// 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
40
+// 	spec := "0 0 0 ? * Sun"
41
+// 	createStaffScheduleCronJob.AddFunc(spec, func() {
42
+// 		AutoCreateStaffScheduleJob()
43
+// 	})
44
+// }
44
 
45
 
45
 func BeginAutoCreateStaffScheduleJob() {
46
 func BeginAutoCreateStaffScheduleJob() {
46
 
47
 

+ 14 - 13
models/service/auto_create_week_disinfection.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/jinzhu/gorm"
8
-	"github.com/robfig/cron"
9
 	"strconv"
7
 	"strconv"
10
 	"time"
8
 	"time"
9
+
10
+	"github.com/jinzhu/gorm"
11
+	"github.com/robfig/cron"
11
 )
12
 )
12
 
13
 
13
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
14
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
14
 var createWeekDisinfectionCronJob *cron.Cron
15
 var createWeekDisinfectionCronJob *cron.Cron
15
 
16
 
16
-func init() {
17
-	createWeekDisinfectionCronJob = cron.New()
18
-	//spec := "0 0 23 * * ?" // 每天23点执行一次
19
-	spec := "0 55 23 * * ?" // 每天23点55执行一次
20
-	//spec := "0 0 5 * * ?" // 每天23点55执行一次
21
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
22
-	createWeekDisinfectionCronJob.AddFunc(spec, func() {
17
+// func init() {
18
+// 	createWeekDisinfectionCronJob = cron.New()
19
+// 	//spec := "0 0 23 * * ?" // 每天23点执行一次
20
+// 	spec := "0 55 23 * * ?" // 每天23点55执行一次
21
+// 	//spec := "0 0 5 * * ?" // 每天23点55执行一次
22
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
23
+// 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
23
 
24
 
24
-		AutoCreateWeekDisinfectionJob()
25
-	})
26
-}
25
+// 		AutoCreateWeekDisinfectionJob()
26
+// 	})
27
+// }
27
 
28
 
28
 func BeginAutoCreateWeekDisinfectionJob() {
29
 func BeginAutoCreateWeekDisinfectionJob() {
29
 
30
 
173
 //	return org, err
174
 //	return org, err
174
 //}
175
 //}
175
 
176
 
176
-//查询当天有排班的所有机构
177
+// 查询当天有排班的所有机构
177
 func GetAllOrgID(time int64) (schedule []*models.XtSchedule, err error) {
178
 func GetAllOrgID(time int64) (schedule []*models.XtSchedule, err error) {
178
 
179
 
179
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
180
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error

+ 12 - 11
models/service/auto_create_week_plan.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/jinzhu/gorm"
8
-	"github.com/robfig/cron"
9
 	"strconv"
7
 	"strconv"
10
 	"time"
8
 	"time"
9
+
10
+	"github.com/jinzhu/gorm"
11
+	"github.com/robfig/cron"
11
 )
12
 )
12
 
13
 
13
 var createWeekPlanCronJob *cron.Cron
14
 var createWeekPlanCronJob *cron.Cron
14
 
15
 
15
-func init() {
16
-	utils.InfoLog("第二次开启自动消毒时任务")
17
-	spec := "0 0 22 * * ?" // 每天22点执行一次
18
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
19
-	createWeekPlanCronJob = cron.New()
20
-	createWeekDisinfectionCronJob.AddFunc(spec, func() {
21
-		AutoCreateWeekPlanJob()
22
-	})
23
-}
16
+// func init() {
17
+// 	utils.InfoLog("第二次开启自动消毒时任务")
18
+// 	spec := "0 0 22 * * ?" // 每天22点执行一次
19
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
20
+// 	createWeekPlanCronJob = cron.New()
21
+// 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
22
+// 		AutoCreateWeekPlanJob()
23
+// 	})
24
+// }
24
 
25
 
25
 func BeginAutoCreatePlanJob() {
26
 func BeginAutoCreatePlanJob() {
26
 	createWeekPlanCronJob.Start()
27
 	createWeekPlanCronJob.Start()

+ 8 - 8
models/service/auto_create_week_schedules_service.go View File

15
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
15
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
16
 var createWeekSchedulesCronJob *cron.Cron
16
 var createWeekSchedulesCronJob *cron.Cron
17
 
17
 
18
-func init() {
19
-	utils.InfoLog("开启自动排班定时任务")
20
-	createWeekSchedulesCronJob = cron.New()
21
-	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
22
-	createWeekSchedulesCronJob.AddFunc(spec, func() {
23
-		AutoCreateWeekSchedules()
24
-	})
25
-}
18
+// func init() {
19
+// 	utils.InfoLog("开启自动排班定时任务")
20
+// 	createWeekSchedulesCronJob = cron.New()
21
+// 	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
22
+// 	createWeekSchedulesCronJob.AddFunc(spec, func() {
23
+// 		AutoCreateWeekSchedules()
24
+// 	})
25
+// }
26
 
26
 
27
 func BeginAutoCreateWeekSchedulesJob() {
27
 func BeginAutoCreateWeekSchedulesJob() {
28
 	createWeekSchedulesCronJob.Start()
28
 	createWeekSchedulesCronJob.Start()

+ 8 - 8
service/auto_clear_schedules_service.go View File

11
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
11
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
12
 var clearSchedulesCronJob *cron.Cron
12
 var clearSchedulesCronJob *cron.Cron
13
 
13
 
14
-func init() {
15
-	utils.InfoLog("开启自动清除排班定时任务")
16
-	clearSchedulesCronJob = cron.New()
17
-	spec := "0 0 1 * * ?" // 每天凌晨1点清除已排班未上机的排班数据
18
-	clearSchedulesCronJob.AddFunc(spec, func() {
19
-		AutoClearSchedules()
20
-	})
21
-}
14
+// func init() {
15
+// 	utils.InfoLog("开启自动清除排班定时任务")
16
+// 	clearSchedulesCronJob = cron.New()
17
+// 	spec := "0 0 1 * * ?" // 每天凌晨1点清除已排班未上机的排班数据
18
+// 	clearSchedulesCronJob.AddFunc(spec, func() {
19
+// 		AutoClearSchedules()
20
+// 	})
21
+// }
22
 
22
 
23
 func BeginAutoClearSchedulesJob() {
23
 func BeginAutoClearSchedulesJob() {
24
 	clearSchedulesCronJob.Start()
24
 	clearSchedulesCronJob.Start()

+ 15 - 14
service/auto_create_drug.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/robfig/cron"
8
 	"strconv"
7
 	"strconv"
9
 	"time"
8
 	"time"
9
+
10
+	"github.com/robfig/cron"
10
 )
11
 )
11
 
12
 
12
 var createDrugCronJob *cron.Cron
13
 var createDrugCronJob *cron.Cron
13
 
14
 
14
-func init() {
15
-	createDrugCronJob = cron.New()
16
-	utils.InfoLog("开启自动更新药品库存定时任务")
17
-	spec := "0 */1 * * * ?" // 每1分钟执行一次
18
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
19
-	//spec := "0 0 0 ? * Sun"
20
-	createDrugCronJob.AddFunc(spec, func() {
21
-		AutoCreateDrugJob()
22
-	})
15
+// func init() {
16
+// 	createDrugCronJob = cron.New()
17
+// 	utils.InfoLog("开启自动更新药品库存定时任务")
18
+// 	spec := "0 */1 * * * ?" // 每1分钟执行一次
19
+// 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
20
+// 	//spec := "0 0 0 ? * Sun"
21
+// 	createDrugCronJob.AddFunc(spec, func() {
22
+// 		AutoCreateDrugJob()
23
+// 	})
23
 
24
 
24
-}
25
+// }
25
 
26
 
26
 func BeginAutoCreateDrugJob() {
27
 func BeginAutoCreateDrugJob() {
27
 
28
 
71
 
72
 
72
 }
73
 }
73
 
74
 
74
-//查询当天有排班的所有机构
75
+// 查询当天有排班的所有机构
75
 func GetAllOrgName(time int64) (schedule []*models.XtSchedule, err error) {
76
 func GetAllOrgName(time int64) (schedule []*models.XtSchedule, err error) {
76
 
77
 
77
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
78
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
79
 	return schedule, err
80
 	return schedule, err
80
 }
81
 }
81
 
82
 
82
-//根据机构ID查询药品信息
83
+// 根据机构ID查询药品信息
83
 func FindAllDrugList(orgid int64) (lib []*models.BaseDrugLib, err error) {
84
 func FindAllDrugList(orgid int64) (lib []*models.BaseDrugLib, err error) {
84
 
85
 
85
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&lib).Error
86
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&lib).Error
86
 	return lib, err
87
 	return lib, err
87
 }
88
 }
88
 
89
 
89
-//根据药品ID统计该药品的库存
90
+// 根据药品ID统计该药品的库存
90
 func FindAllDrugTotalCount(drug_id int64) (info []*models.DrugWarehouseInfoSix, err error) {
91
 func FindAllDrugTotalCount(drug_id int64) (info []*models.DrugWarehouseInfoSix, err error) {
91
 
92
 
92
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
93
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")

+ 11 - 10
service/auto_create_staff_schedule_service.go View File

3
 import (
3
 import (
4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"fmt"
5
 	"fmt"
6
+	"time"
7
+
6
 	"github.com/jinzhu/gorm"
8
 	"github.com/jinzhu/gorm"
7
 	"github.com/robfig/cron"
9
 	"github.com/robfig/cron"
8
-	"time"
9
 )
10
 )
10
 
11
 
11
 //// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
12
 //// cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
32
 
33
 
33
 var createStaffScheduleCronJob *cron.Cron
34
 var createStaffScheduleCronJob *cron.Cron
34
 
35
 
35
-func init() {
36
+// func init() {
36
 
37
 
37
-	createStaffScheduleCronJob = cron.New()
38
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
39
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
40
-	spec := "0 0 0 ? * Sun"
41
-	createStaffScheduleCronJob.AddFunc(spec, func() {
42
-		AutoCreateStaffScheduleJob()
43
-	})
44
-}
38
+// 	createStaffScheduleCronJob = cron.New()
39
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
40
+// 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
41
+// 	spec := "0 0 0 ? * Sun"
42
+// 	createStaffScheduleCronJob.AddFunc(spec, func() {
43
+// 		AutoCreateStaffScheduleJob()
44
+// 	})
45
+// }
45
 
46
 
46
 func BeginAutoCreateStaffScheduleJob() {
47
 func BeginAutoCreateStaffScheduleJob() {
47
 
48
 

+ 14 - 13
service/auto_create_stock.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/robfig/cron"
8
 	"strconv"
7
 	"strconv"
9
 	"time"
8
 	"time"
9
+
10
+	"github.com/robfig/cron"
10
 )
11
 )
11
 
12
 
12
 var createStockCronJob *cron.Cron
13
 var createStockCronJob *cron.Cron
13
 
14
 
14
-func init() {
15
-	utils.InfoLog("开启自动更新耗材库存定时任务")
16
-	createStockCronJob = cron.New()
17
-	spec := "0 */5 * * * ?" // 每1分钟执行一次
18
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
19
-	//spec := "0 0 0 ? * Sun"
20
-	createStockCronJob.AddFunc(spec, func() {
21
-		utils.InfoLog("开启自动更新耗材库存定时任务1111111111111")
22
-		AutoCreateStockJob()
23
-	})
24
-}
15
+// func init() {
16
+// 	utils.InfoLog("开启自动更新耗材库存定时任务")
17
+// 	createStockCronJob = cron.New()
18
+// 	spec := "0 */5 * * * ?" // 每1分钟执行一次
19
+// 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
20
+// 	//spec := "0 0 0 ? * Sun"
21
+// 	createStockCronJob.AddFunc(spec, func() {
22
+// 		utils.InfoLog("开启自动更新耗材库存定时任务1111111111111")
23
+// 		AutoCreateStockJob()
24
+// 	})
25
+// }
25
 
26
 
26
 func BeginAutoCreateStockJob() {
27
 func BeginAutoCreateStockJob() {
27
 
28
 
61
 	}
62
 	}
62
 }
63
 }
63
 
64
 
64
-//查询所有的耗材信息
65
+// 查询所有的耗材信息
65
 func FindAlLGoodInformation(orgid int64) (info []*models.GoodInfo, err error) {
66
 func FindAlLGoodInformation(orgid int64) (info []*models.GoodInfo, err error) {
66
 
67
 
67
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&info).Error
68
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&info).Error

+ 14 - 13
service/auto_create_week_disinfection.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/jinzhu/gorm"
8
-	"github.com/robfig/cron"
9
 	"strconv"
7
 	"strconv"
10
 	"time"
8
 	"time"
9
+
10
+	"github.com/jinzhu/gorm"
11
+	"github.com/robfig/cron"
11
 )
12
 )
12
 
13
 
13
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
14
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
14
 var createWeekDisinfectionCronJob *cron.Cron
15
 var createWeekDisinfectionCronJob *cron.Cron
15
 
16
 
16
-func init() {
17
-	createWeekDisinfectionCronJob = cron.New()
18
-	//spec := "0 0 23 * * ?" // 每天23点执行一次
19
-	spec := "0 55 23 * * ?" // 每天23点55执行一次
20
-	//spec := "0 0 5 * * ?" // 每天23点55执行一次
21
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
22
-	createWeekDisinfectionCronJob.AddFunc(spec, func() {
17
+// func init() {
18
+// 	createWeekDisinfectionCronJob = cron.New()
19
+// 	//spec := "0 0 23 * * ?" // 每天23点执行一次
20
+// 	spec := "0 55 23 * * ?" // 每天23点55执行一次
21
+// 	//spec := "0 0 5 * * ?" // 每天23点55执行一次
22
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
23
+// 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
23
 
24
 
24
-		AutoCreateWeekDisinfectionJob()
25
-	})
26
-}
25
+// 		AutoCreateWeekDisinfectionJob()
26
+// 	})
27
+// }
27
 
28
 
28
 func BeginAutoCreateWeekDisinfectionJob() {
29
 func BeginAutoCreateWeekDisinfectionJob() {
29
 
30
 
173
 //	return org, err
174
 //	return org, err
174
 //}
175
 //}
175
 
176
 
176
-//查询当天有排班的所有机构
177
+// 查询当天有排班的所有机构
177
 func GetAllOrgID(time int64) (schedule []*models.XtSchedule, err error) {
178
 func GetAllOrgID(time int64) (schedule []*models.XtSchedule, err error) {
178
 
179
 
179
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
180
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error

+ 12 - 11
service/auto_create_week_plan.go View File

4
 	"Xcx_New/models"
4
 	"Xcx_New/models"
5
 	"Xcx_New/utils"
5
 	"Xcx_New/utils"
6
 	"fmt"
6
 	"fmt"
7
-	"github.com/jinzhu/gorm"
8
-	"github.com/robfig/cron"
9
 	"strconv"
7
 	"strconv"
10
 	"time"
8
 	"time"
9
+
10
+	"github.com/jinzhu/gorm"
11
+	"github.com/robfig/cron"
11
 )
12
 )
12
 
13
 
13
 var createWeekPlanCronJob *cron.Cron
14
 var createWeekPlanCronJob *cron.Cron
14
 
15
 
15
-func init() {
16
-	utils.InfoLog("第二次开启自动消毒时任务")
17
-	spec := "0 0 22 * * ?" // 每天22点执行一次
18
-	//spec := "0 */1 * * * ?" // 每1分钟执行一次
19
-	createWeekPlanCronJob = cron.New()
20
-	createWeekDisinfectionCronJob.AddFunc(spec, func() {
21
-		AutoCreateWeekPlanJob()
22
-	})
23
-}
16
+// func init() {
17
+// 	utils.InfoLog("第二次开启自动消毒时任务")
18
+// 	spec := "0 0 22 * * ?" // 每天22点执行一次
19
+// 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
20
+// 	createWeekPlanCronJob = cron.New()
21
+// 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
22
+// 		AutoCreateWeekPlanJob()
23
+// 	})
24
+// }
24
 
25
 
25
 func BeginAutoCreatePlanJob() {
26
 func BeginAutoCreatePlanJob() {
26
 	createWeekPlanCronJob.Start()
27
 	createWeekPlanCronJob.Start()

+ 8 - 8
service/auto_create_week_schedules_service.go View File

15
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
15
 // cron表达式 https://www.cnblogs.com/zuxingyu/p/6023919.html
16
 var createWeekSchedulesCronJob *cron.Cron
16
 var createWeekSchedulesCronJob *cron.Cron
17
 
17
 
18
-func init() {
19
-	utils.InfoLog("开启自动排班定时任务")
20
-	createWeekSchedulesCronJob = cron.New()
21
-	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
22
-	createWeekSchedulesCronJob.AddFunc(spec, func() {
23
-		AutoCreateWeekSchedules()
24
-	})
25
-}
18
+// func init() {
19
+// 	utils.InfoLog("开启自动排班定时任务")
20
+// 	createWeekSchedulesCronJob = cron.New()
21
+// 	spec := "0 0 0 ? * MON" // 每周一凌晨0点生成排班
22
+// 	createWeekSchedulesCronJob.AddFunc(spec, func() {
23
+// 		AutoCreateWeekSchedules()
24
+// 	})
25
+// }
26
 
26
 
27
 func BeginAutoCreateWeekSchedulesJob() {
27
 func BeginAutoCreateWeekSchedulesJob() {
28
 	createWeekSchedulesCronJob.Start()
28
 	createWeekSchedulesCronJob.Start()