代码交接

ColdVerify_server.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"ColdVerify_server/TimeTask"
 	"ColdVerify_server/conf"
 	_ "ColdVerify_server/routers"
 	"fmt"
@@ -48,6 +49,8 @@ func main() {
 	beego.BConfig.RunMode = "dev"                           //  应用的运行模式
 	beego.BConfig.Listen.HTTPPort = HTTPPort_int            //监听端口  本地：8518  线上：8528
 
+	go TimeTask.Init() // 定时任务
+
 	beego.Run()
 
 }

Nats/Nats.go

@@ -24,7 +24,7 @@ func init() {
 	lib.Nats, err = nats.Connect("nats://" + conf.NatsServer_Url)
 	if err != nil {
 		logs.Error("nats 连接失败！")
-		panic(err)
+		panic(any(err))
 	}
 	logs.Println("nats OK！")
 	// 本地测试，屏蔽本地nats

Nats/NatsServer/NatsQiniu.go

@@ -23,7 +23,7 @@ func Qiniu_UploadToken(T_suffix string, T_MimeLimit string) (string, bool) {
 		T_MimeLimit: T_MimeLimit,
 	})
 	if err != nil {
-		panic(err)
+		panic(any(err))
 	}
 
 	// 请求-响应， 向 test3 发布一个 `help me` 请求数据，设置超时间3秒，如果有多个响应，只接收第一个收到的消息
@@ -48,7 +48,7 @@ func Qiniu_UploadToken(T_suffix string, T_MimeLimit string) (string, bool) {
 //	println(":", RR.File)
 //	b, err := msgpack.Marshal(&RR)
 //	if err != nil {
-//		panic(err)
+//		panic(any(err))
 //	}
 //
 //	// 请求-响应， 向 test3 发布一个 `help me` 请求数据，设置超时间3秒，如果有多个响应，只接收第一个收到的消息

TimeTask/OrmLog.go

@@ -0,0 +1,38 @@
+package TimeTask
+
+//import (
+//	"fmt"
+//	"io/ioutil"
+//	"os"
+//	"time"
+//)
+//
+//var OrmLogOrmLog *os.File
+//// ORM 日志清理
+//func OrmLog()  {
+//	crontab := cron.New(cron.WithSeconds())
+//	ss := "1 1 1 * * *"
+//	_, err := crontab.AddFunc(ss, OrmLog_MonitorScanStatus)
+//	if err != nil {
+//		fmt.Printf("err: %v\n", err)
+//		fmt.Println("初始化成功")
+//	}
+//	crontab.Start()
+//	defer crontab.Stop()
+//	select {}
+//}
+//func OrmLog_MonitorScanStatus()  {
+//
+//	fmt.Println("------- ORM 日志清理 --------")
+//	data, err := ioutil.ReadFile(OrmLogOrmLog.Name())
+//	if err != nil {
+//		fmt.Printf("文件打开失败=%v\n", err)
+//		return
+//	}
+//	err = ioutil.WriteFile("logs/orm/logx_"+time.Now().Format("2006-01-02") +".log", data, 0666)
+//	if err != nil {
+//		fmt.Printf("文件打开失败=%v\n", err)
+//	}
+//	fmt.Println("清空：",os.Truncate(OrmLogOrmLog.Name(), 0))
+//
+//}

TimeTask/TaskList.go

@@ -0,0 +1,76 @@
+package TimeTask
+
+import (
+	"ColdVerify_server/lib"
+	"ColdVerify_server/lib/wx"
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/Account"
+	"ColdVerify_server/models/InfoCollection"
+	"ColdVerify_server/models/Task"
+	"fmt"
+
+	"github.com/robfig/cron/v3"
+	"time"
+)
+
+
+func TaskList()  {
+	crontab := cron.New(cron.WithSeconds())
+	ss := "0 10 * * *"
+	_, err := crontab.AddFunc(ss, TaskList_return)
+	if err != nil {
+		fmt.Printf("err: %v\n", err)
+	}
+	crontab.Start()
+	defer crontab.Stop()
+	select {}
+}
+
+// 回款
+func TaskList_return()  {
+
+	logs.Println("------- 任务回款 定时任务 --------")
+	List, _ := Task.Read_Task_List_All()
+
+	for _,T := range List{
+
+		logs.Println("任务ID:",T.Id)
+
+		var InfoCollection_r  InfoCollection.InfoCollection //信息采集
+		if len(T.T_InfoCollection_id) == 0 {
+			logs.Println("信息采集表获取 为空！！")
+			continue;
+		}
+		var is bool
+		InfoCollection_r, is = InfoCollection.Read_InfoCollection(T.T_InfoCollection_id)
+		if !is {
+			logs.Println("信息采集表获取错误 T_InfoCollection_id ",T.T_InfoCollection_id)
+			continue;
+		}
+
+		if InfoCollection_r.T_State == 5 {
+			logs.Println("已经回款")
+			continue;
+		}
+		if len(T.T_reporting_end_time) == 0{
+			logs.Println("正在进行中")
+			continue;
+		}
+
+		T_collection_time_interval, _ := lib.MinutesDifference(T.T_reporting_end_time, time.Now().Format("2006-01-02 15:04:05") )
+		T_collection_time_interval = T_collection_time_interval / 60 / 24
+		logs.Println("用时 天：",T_collection_time_interval)
+		if T_collection_time_interval <= 30 {
+			logs.Println("未超时！！！",)
+			continue;
+		}
+		_, company_r := Account.Read_User_ByT_uuid(T.T_uuid)
+		//AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
+
+		//go System.Send_Weichat_News(AdminMap[T.T_scheme], fmt.Sprintf("【项目回款】项目回款已经超过%d天【%s-%s】", int(T_collection_time_interval) ,company_r.T_name, T.T_name), "")
+		go wx.WxSend(T.T_scheme, fmt.Sprintf("【项目回款】项目回款已经超过%d天【%s-%s】", int(T_collection_time_interval) ,company_r.T_name, T.T_name))
+
+	}
+
+
+}

TimeTask/TimeTask.go

@@ -0,0 +1,6 @@
+package TimeTask
+
+func Init() {
+	go TaskList()
+
+}

Z_Build.bat

@@ -5,4 +5,4 @@ set GOPATH=C:\Users\SIKED\go
 set GO111MODULE=auto
 
 
-go build ColdVerify_server.go
+go build -o ColdVerify_server6300 ColdVerify_server.go

conf/app.conf

@@ -6,20 +6,20 @@ EnableDocs = true
 copyrequestbody = true
 
 # Nats
-NatsServer_Url = "127.0.0.1:43422"
+NatsServer_Url = "182.44.114.34:4222"
 NatsForbidden = true
 
-MysqlServer_UrlPort = "203.34.49.130:3306"
+MysqlServer_UrlPort = "182.44.114.34:3306"
 MysqlServer_Database = "coldverify"
-MysqlServer_Username = "coldverify"
-MysqlServer_Password = "Bd3d34yJ7aibiEi"
+MysqlServer_Username = "root"
+MysqlServer_Password = "mysql_Ks7WAX"
 MysqlServer_MaxIdleConnections = 100
 MysqlServer_MaxOpenConnections = 200
 
 
 # Redis
-Redis_address = "203.34.49.130:6379"
-Redis_password = "redis_GGRi8f"
+Redis_address = "182.44.114.34:6379"
+Redis_password = "redis_F2tj7p"
 Redis_dbNum = "2"
 
 
@@ -34,3 +34,10 @@ Oss = "https://bzdcoldverifyoss.baozhida.cn"
 # 发送微信通知
 WechatNews_GroupName = "宝智达-软件组"
 WechatNews_Url = "http://111.85.177.202:12088/send"
+
+# 老板 uuid
+BoosUuid = "fa5be10f-5be1-42be-a8dc-8d142e006266"
+# 冷链验证 报告负责人
+VdelUuid = "1c13436c-4511-4030-8b26-baadad88445a"
+
+

conf/config.go

@@ -38,3 +38,5 @@ var Oss_file, _ = beego.AppConfig.String("Oss_file")
 // 微信消息群通知
 var WechatNews_GroupName, _ = beego.AppConfig.String("WechatNews_GroupName")
 var WechatNews_Url, _ = beego.AppConfig.String("WechatNews_Url")
+var BoosUuid, _ = beego.AppConfig.String("BoosUuid")
+var VdelUuid, _ = beego.AppConfig.String("VdelUuid")

controllers/Account.go

@@ -133,6 +133,7 @@ func (c *AccountController) Add() {
 	T_name := c.GetString("T_name")
 	T_user := c.GetString("T_user")
 	T_pass := c.GetString("T_pass")
+	T_wxname := c.GetString("T_wxname")
 
 	var_ := Account.Admin{
 		T_uuid:  T_uuid,
@@ -140,6 +141,7 @@ func (c *AccountController) Add() {
 		T_name:  T_name,
 		T_user:  T_user,
 		T_pass:  T_pass,
+		T_wxname:  T_wxname,
 		T_State: 1,
 	}
 
@@ -183,6 +185,7 @@ func (c *AccountController) Up() {
 	T_name := c.GetString("T_name")
 	T_user := c.GetString("T_user")
 	T_pass := c.GetString("T_pass")
+	T_wxname := c.GetString("T_wxname")
 
 	err, r := Account.Read_Admin_ByT_uuid(T_uuid)
 	if err != nil {
@@ -208,8 +211,11 @@ func (c *AccountController) Up() {
 	if len(T_pass) > 0 {
 		r.T_pass = T_pass
 	}
+	if len(T_wxname) > 0 {
+		r.T_wxname = T_wxname
+	}
 
-	if !Account.Update_Admin(r, "T_power", "T_name", "T_user", "T_pass") {
+	if !Account.Update_Admin(r, "T_power", "T_name", "T_user", "T_pass", "T_wxname") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return

controllers/DeviceClass.go

@@ -398,6 +398,34 @@ func (c *DeviceClassController) List_Add() {
 	T_class, _ := c.GetInt("T_class")
 	T_sn_id_list := c.GetString("T_sn_id_list")
 
+
+	// 根据 | 分割数据
+	items := strings.Split(T_sn_id_list, "|")
+
+	// 创建一个 map 来去重
+	uniqueItems := make(map[string]struct{})
+
+	for _, item := range items {
+		// 如果不为空，则添加到 map 中
+		if item != "" {
+			uniqueItems[item] = struct{}{}
+		}
+	}
+
+	// 将唯一项拼接成字符串
+	result := ""
+
+	for item := range uniqueItems {
+		result += item + "|"
+	}
+
+	// 移除最后的 | 字符
+	if len(result) > 0 {
+		result = result[:len(result)-1]
+	}
+	T_sn_id_list = result
+
+
 	list := strings.Split(strings.TrimRight(T_sn_id_list, "|"), "|")
 	T_remark := c.GetString("T_remark")
 
@@ -706,7 +734,7 @@ func (c *DeviceClassController) List_Del() {
 func (c *DeviceClassController) List_Template_Download() {
 
 	// 返回生成的 Excel 文件
-	c.Ctx.Output.Download("ofile/添加设备列表模板.xlsx")
+	c.Ctx.Output.Download("static/添加设备列表模板.xlsx")
 }
 
 func (c *DeviceClassController) List_Del_Duplication() {

controllers/Task.go

@@ -4,6 +4,7 @@ import (
 	"ColdVerify_server/Nats/NatsServer"
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/lib/wx"
 	"ColdVerify_server/logs"
 	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Device"
@@ -68,6 +69,7 @@ func (c *TaskController) List() {
 	T_reporting_state := c.GetString("T_reporting_state")   // 报告编写 状态 0 未完成 1 已完成(客户通过) 2已退回(客户) 3已通过(负责人) 4已退回(负责人) 5已提交
 	T_delivery_state := c.GetString("T_delivery_state")     // 交付审核 状态 0 未完成 1 已完成 2 处理中
 	T_marking_state := c.GetString("T_marking_state")       // 验证标识 状态 0 未完成 1 已完成
+	CreateTime := c.GetString("CreateTime")       // 任务添加时间
 
 	UserMap := Account.UserListToMap(Account.Read_User_List_ALL_1())
 	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
@@ -85,7 +87,7 @@ func (c *TaskController) List() {
 	var cnt int
 	List, cnt := Task.Read_Task_List(T_uuid, T_admin, T_name, T_InfoCollection_id, T_scheme, T_collection, T_reporting, T_delivery,
 		T_scheme_state, T_collection_state, T_reporting_state, T_delivery_state, T_marking_state,
-		T_company_list, UserMap, AdminMap, page, page_z)
+		T_company_list, UserMap, AdminMap,CreateTime, page, page_z)
 
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
@@ -134,6 +136,7 @@ func (c *TaskController) Stat() {
 	T_reporting_state := c.GetString("T_reporting_state")   // 报告编写 状态 0 未完成 1 已完成(客户通过) 2已退回(客户) 3已通过(负责人) 4已退回(负责人) 5已提交
 	T_delivery_state := c.GetString("T_delivery_state")     // 交付审核 状态 0 未完成 1 已完成 2 处理中
 	T_marking_state := c.GetString("T_marking_state")       // 验证标识 状态 0 未完成 1 已完成
+	CreateTime := c.GetString("CreateTime")       // 任务添加时间
 
 	UserMap := Account.UserListToMap(Account.Read_User_List_ALL_1())
 	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
@@ -151,7 +154,7 @@ func (c *TaskController) Stat() {
 	var cnt int
 	List, cnt := Task.Read_Task_Stat(T_uuid, T_admin, T_name, T_InfoCollection_id, T_project, T_scheme, T_collection, T_reporting, T_delivery,
 		T_scheme_state, T_collection_state, T_reporting_state, T_delivery_state, T_marking_state,
-		T_company_list, UserMap, AdminMap, page, page_z)
+		T_company_list, UserMap, AdminMap,CreateTime, page, page_z)
 
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
@@ -190,6 +193,7 @@ func (c *TaskController) Stat_Excel() {
 	T_reporting_state := c.GetString("T_reporting_state")   // 报告编写 状态 0 未完成 1 已完成(客户通过) 2已退回(客户) 3已通过(负责人) 4已退回(负责人) 5已提交
 	T_delivery_state := c.GetString("T_delivery_state")     // 交付审核 状态 0 未完成 1 已完成 2 处理中
 	T_marking_state := c.GetString("T_marking_state")       // 验证标识 状态 0 未完成 1 已完成
+	CreateTime := c.GetString("CreateTime")       // 任务添加时间
 
 	UserMap := Account.UserListToMap(Account.Read_User_List_ALL_1())
 	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
@@ -206,7 +210,7 @@ func (c *TaskController) Stat_Excel() {
 
 	List, _ := Task.Read_Task_Stat(T_uuid, T_admin, T_name, T_InfoCollection_id, T_project, T_scheme, T_collection, T_reporting, T_delivery,
 		T_scheme_state, T_collection_state, T_reporting_state, T_delivery_state, T_marking_state,
-		T_company_list, UserMap, AdminMap, 0, 9999)
+		T_company_list, UserMap, AdminMap,CreateTime, 0, 9999)
 
 	f := excelize.NewFile() // 设置单元格的值
 	line := 1
@@ -227,7 +231,6 @@ func (c *TaskController) Stat_Excel() {
 	f.MergeCell("Sheet1", fmt.Sprintf("N%d", line), fmt.Sprintf("N%d", line+1))
 	f.MergeCell("Sheet1", fmt.Sprintf("O%d", line), fmt.Sprintf("O%d", line+1))
 	f.MergeCell("Sheet1", fmt.Sprintf("P%d", line), fmt.Sprintf("P%d", line+1))
-
 	f.MergeCell("Sheet1", fmt.Sprintf("Q%d", line), fmt.Sprintf("U%d", line))
 	f.MergeCell("Sheet1", fmt.Sprintf("V%d", line), fmt.Sprintf("AA%d", line))
 	f.MergeCell("Sheet1", fmt.Sprintf("AB%d", line), fmt.Sprintf("AG%d", line))
@@ -277,6 +280,7 @@ func (c *TaskController) Stat_Excel() {
 	f.SetCellValue("Sheet1", fmt.Sprintf("AK%d", line+1), "退回次数")
 	f.SetCellValue("Sheet1", fmt.Sprintf("AL%d", line+1), "所需时间")
 	f.SetCellValue("Sheet1", fmt.Sprintf("AM%d", line+1), "超时时间")
+	f.SetCellValue("Sheet1", fmt.Sprintf("AN%d", line+1), "领导备注")
 
 	// 设置列宽
 	f.SetColWidth("Sheet1", "A", "A", 7)
@@ -384,6 +388,7 @@ func (c *TaskController) Stat_Excel() {
 		f.SetCellValue("Sheet1", fmt.Sprintf("AK%d", line), v.T_reporting_return_times)
 		f.SetCellValue("Sheet1", fmt.Sprintf("AL%d", line), v.T_reporting_time_interval)
 		f.SetCellValue("Sheet1", fmt.Sprintf("AM%d", line), v.T_reporting_overtime)
+		f.SetCellValue("Sheet1", fmt.Sprintf("AN%d", line), v.T_record)
 	}
 
 	Style2, _ := f.NewStyle(
@@ -468,6 +473,7 @@ func (c *TaskController) Stat_Excel() {
 	f.SetCellStyle("Sheet1", "V1", "AA1", StyleOrangeFill)
 	f.SetCellStyle("Sheet1", "AB1", "AG1", StyleYellowFill)
 	f.SetCellStyle("Sheet1", "AH1", "AM1", StyleGreenFill)
+	f.SetCellStyle("Sheet1", "AN1", "AN2", StyleBlueFill)
 
 	// 冻结1-2行
 	f.SetPanes("Sheet1", &excelize.Panes{
@@ -694,6 +700,15 @@ func (c *TaskController) Add() {
 		return
 	}
 	NatsServer.Create_Local_Table(T_task_id)
+
+	// 通知
+	_, company_r := Account.Read_User_ByT_uuid(var_.T_uuid)
+	go wx.WxSend(var_.T_scheme, fmt.Sprintf("【%s-%s】任务派发", company_r.T_name, var_.T_name))
+	go wx.WxSend(var_.T_collection, fmt.Sprintf("【%s-%s】任务派发", company_r.T_name, var_.T_name))
+	go wx.WxSend(var_.T_reporting, fmt.Sprintf("【%s-%s】任务派发", company_r.T_name, var_.T_name))
+	go wx.WxSend(var_.T_delivery, fmt.Sprintf("【%s-%s】任务派发", company_r.T_name, var_.T_name))
+
+
 	// 添加任务操作日志
 	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "添加", var_)
 	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "添加", var_)
@@ -714,6 +729,7 @@ func (c *TaskController) ReceiptInfoCollection() {
 	}
 	// 修改信息采集状态为已接收
 	T_InfoCollection_id := c.GetString("T_InfoCollection_id")
+	//T_status,_ := c.GetInt("T_status")
 	infoCollection, is := InfoCollection.Read_InfoCollection(T_InfoCollection_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
@@ -725,36 +741,41 @@ func (c *TaskController) ReceiptInfoCollection() {
 		c.ServeJSON()
 		return
 	}
-	infoCollection.T_status = InfoCollection.InfoCollectionStatusReceipt
-	if len(infoCollection.T_end_time) == 0 {
-		infoCollection.T_end_time = time.Now().Format("2006-01-02 15:04:05")
-		infoCollection.T_time_interval, _ = lib.MinutesDifference(infoCollection.T_start_time, infoCollection.T_end_time)
-	}
+	//infoCollection.T_status = InfoCollection.InfoCollectionStatusReceipt
+	//if len(infoCollection.T_end_time) == 0 {
+	//	infoCollection.T_end_time = time.Now().Format("2006-01-02 15:04:05")
+	//	infoCollection.T_time_interval, _ = lib.MinutesDifference(infoCollection.T_start_time, infoCollection.T_end_time)
+	//}
 
-	if !InfoCollection.Update_InfoCollection(infoCollection, "T_status", "T_end_time", "T_time_interval") {
+	//if !InfoCollection.Update_InfoCollection(infoCollection, "T_status", "T_end_time", "T_time_interval") {
+	infoCollection.T_status = 3 // 已接收
+	if !InfoCollection.Update_InfoCollection(infoCollection, "T_status") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
 	System.Add_UserLogs_T(User_r.T_uuid, "信息采集管理", "接收信息采集", infoCollection)
 
+	//if T_status == InfoCollection.InfoCollectionStatusReturn{
+	//	// 通知 报告负责人审核
+	//	_, company_r := Account.Read_User_ByT_uuid(infoCollection.T_uuid)
+	//	System.Add_News(conf.VdelUuid, fmt.Sprintf("【%s-%s】信息采集 已退回", company_r.T_name, infoCollection.T_name), "")
+	//	go wx.WxSend(conf.VdelUuid, fmt.Sprintf("【%s-%s】信息采集 已退回", company_r.T_name, infoCollection.T_name))
+	//
+	//}
+
 	// 修改任务管理实施方案开始时间
-	T_task_id := c.GetString("T_task_id")
-	task, is := Task.Read_Task(T_task_id)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
-		c.ServeJSON()
-		return
-	}
-	task.T_scheme_start_time = time.Now().Format("2006-01-02 15:04:05")
-	if !Task.Update_Task(task, "T_scheme_start_time") {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
-		c.ServeJSON()
-		return
-	}
+	//T_task_id := c.GetString("T_task_id")
+	//task, is := Task.Read_Task(T_task_id)
+	//if !is {
+	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+	//	c.ServeJSON()
+	//	return
+	//}
+	
 	// 添加任务操作日志
-	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "接收信息采集", task)
-	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "接收信息采集", task)
+	//Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "接收信息采集", task)
+	//System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "接收信息采集", task)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
@@ -874,11 +895,10 @@ func (c *TaskController) UpCollectionState() {
 		return
 	}
 
-	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
-	if T_collection_state == Task.TaskCollectionStateReturn ||
-		T_collection_state == Task.TaskCollectionStatePass {
-		System.Add_News(r.T_collection, fmt.Sprintf("【数据编辑】您提交的数据编辑【%s-%s】审核%s", company_r.T_name, r.T_name, Task.TaskCollectionStateMap[T_collection_state]), "")
-		go System.Send_Weichat_News(AdminMap[r.T_collection], fmt.Sprintf("【数据编辑】您提交的数据编辑【%s-%s】审核%s", company_r.T_name, r.T_name, Task.TaskCollectionStateMap[T_collection_state]), "")
+	// 已退回(负责人)
+	if T_collection_state == Task.TaskCollectionStateReturn {
+		System.Add_News(r.T_collection, fmt.Sprintf("【%s-%s】数据编辑 %s,%s", company_r.T_name, r.T_name, Task.TaskCollectionStateMap[T_collection_state],T_reason), "")
+		go wx.WxSend(r.T_collection, fmt.Sprintf("【%s-%s】数据编辑 %s,%s", company_r.T_name, r.T_name, Task.TaskCollectionStateMap[T_collection_state],T_reason))
 	}
 
 	// 添加任务操作日志
@@ -922,6 +942,38 @@ func (c *TaskController) UpDeliveryState() {
 	return
 }
 
+// 更新线上数据后台执行
+func (c *TaskDataController) TaskData_Up_TaskData_Back() {
+	// 验证登录 User_is, User_r
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_task_id := c.GetString("T_task_id")
+	r, is := Task.Read_Task(T_task_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+
+
+	// 通知 报告人员
+	_, company_r := Account.Read_User_ByT_uuid(r.T_uuid)
+	infoCollection, _ := InfoCollection.Read_InfoCollection(r.T_InfoCollection_id)
+	System.Add_News(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】报告已完成，请及时通知客户审核", company_r.T_name, r.T_name), "")
+	go wx.WxSend(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】报告已完成，请及时通知客户审核", company_r.T_name, r.T_name))
+
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
+	c.ServeJSON()
+	return
+
+}
+
 // 修改-
 func (c *TaskController) Up() {
 	// 验证登录 User_is, User_r
@@ -944,6 +996,8 @@ func (c *TaskController) Up() {
 	T_collection_signature := c.GetString("T_collection_signature") // 完成编辑签字图片
 	T_reporting := c.GetString("T_reporting")
 	T_delivery := c.GetString("T_delivery")
+	T_record := c.GetString("T_record")
+
 	T_doc1 := c.GetString("T_doc1")
 	T_pdf1 := c.GetString("T_pdf1")
 	T_doc2 := c.GetString("T_doc2")
@@ -951,6 +1005,9 @@ func (c *TaskController) Up() {
 	T_doc3 := c.GetString("T_doc3")
 	T_pdf3 := c.GetString("T_pdf3")
 	T_pdf4 := c.GetString("T_pdf4")                                           // 验证标识
+
+
+
 	T_VerifyDeviceDataStartTime := c.GetString("T_VerifyDeviceDataStartTime") // 验证设备数据开始时间
 	T_VerifyDeviceDataEndTime := c.GetString("T_VerifyDeviceDataEndTime")     // 验证设备数据开始时间
 	T_BindDeviceDataStartTime := c.GetString("T_BindDeviceDataStartTime")     // 绑定设备数据开始时间
@@ -972,6 +1029,7 @@ func (c *TaskController) Up() {
 	T_subject_matter := c.GetString("T_subject_matter") // 标的物名称
 	T_temp_range := c.GetString("T_temp_range")         // 验证温度范围
 	T_report_number := c.GetString("T_report_number")   // 报告编号
+	T_report_type := c.GetString("T_report_type")   // 报告编号
 
 	T_task_id := c.GetString("T_task_id")
 	r, is := Task.Read_Task(T_task_id)
@@ -1003,6 +1061,7 @@ func (c *TaskController) Up() {
 		r.T_deadline = T_deadline
 		clos = append(clos, "T_deadline")
 	}
+
 	if len(T_scheme) > 0 {
 		r.T_scheme = T_scheme
 		clos = append(clos, "T_scheme")
@@ -1019,6 +1078,11 @@ func (c *TaskController) Up() {
 		r.T_delivery = T_delivery
 		clos = append(clos, "T_delivery")
 	}
+	if len(T_record) > 0 {
+		r.T_record = T_record
+		clos = append(clos, "T_record")
+	}
+
 
 	// 完成编辑后设置实施结束时间
 	if T_collection_state == 4 {
@@ -1030,20 +1094,31 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_collection_end_time")
 		if len(r.T_collection_start_time) > 0 {
 			r.T_collection_time_interval, _ = lib.MinutesDifference(r.T_collection_start_time, r.T_collection_end_time)
+			// 扣除暂停时间
+			Task_Compute := Task.Read_TaskTime_Compute(r.T_task_id, 1)
+			if Task_Compute > 0 {
+				r.T_collection_time_interval -= float64(Task_Compute)
+			}
+
 			clos = append(clos, "T_collection_time_interval")
 			// 所需时间 > 超时时间
 			if r.T_collection_time_interval > Task.TaskCollectionTimeLimit && len(r.T_report_type) > 0 {
 				r.T_collection_overtime = r.T_collection_time_interval - Task.TaskCollectionTimeLimit // 超时时间
-				clos = append(clos, "T_scheme_overtime")
+				clos = append(clos, "T_collection_overtime")
 			}
+
+			// 通知 报告人员
+			_, company_r := Account.Read_User_ByT_uuid(r.T_uuid)
+			System.Add_News(r.T_reporting, fmt.Sprintf("【%s-%s】数据采集 已提交", company_r.T_name, r.T_name), "")
+			go wx.WxSend(r.T_reporting, fmt.Sprintf("【%s-%s】数据采集 已提交", company_r.T_name, r.T_name))
+
 		}
 		// 添加已提交状态数据编辑记录
 		auditRecordJson, err := Task.Add_AuditRecord(r.T_collection_audit_record, "", User_r.T_uuid, r.T_collection_state, "", "")
-		if err != nil {
-			return
+		if err == nil {
+			r.T_collection_audit_record = auditRecordJson
+			clos = append(clos, "T_collection_audit_record")
 		}
-		r.T_collection_audit_record = auditRecordJson
-		clos = append(clos, "T_collection_audit_record")
 	}
 
 	if len(T_doc1) > 0 {
@@ -1069,16 +1144,28 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_scheme_audit_record")
 		r.T_scheme_end_time = time.Now().Format("2006-01-02 15:04:05")
 		clos = append(clos, "T_scheme_end_time")
-		if len(r.T_scheme_start_time) > 0 {
-			r.T_scheme_time_interval, _ = lib.MinutesDifference(r.T_scheme_start_time, r.T_scheme_end_time)
-			clos = append(clos, "T_scheme_time_interval")
-			// 所需时间 > 超时时间
-			if r.T_scheme_time_interval > Task.TaskSchemeTimeLimit[r.T_report_type] && len(r.T_report_type) > 0 {
-				r.T_scheme_overtime = r.T_scheme_time_interval - Task.TaskSchemeTimeLimit[r.T_report_type] // 超时时间
-				clos = append(clos, "T_scheme_overtime")
+
+		r.T_scheme_time_interval, _ = lib.MinutesDifference(r.T_scheme_start_time, r.T_scheme_end_time)
+		Task_Compute := Task.Read_TaskTime_Compute(r.T_task_id, 0)
+		if Task_Compute > 0 {
+			r.T_scheme_time_interval -= float64(Task_Compute)
+		}
+		clos = append(clos, "T_scheme_time_interval")
+
+		// 所需时间 > 超时时间
+		if r.T_scheme_time_interval > Task.TaskSchemeTimeLimit[r.T_report_type] && len(r.T_report_type) > 0 {
+			r.T_scheme_overtime = r.T_scheme_time_interval - Task.TaskSchemeTimeLimit[r.T_report_type] // 超时时间
+			if Task.TaskSchemeTimeLimit[r.T_report_type]  == 0 {
+				r.T_scheme_overtime = 0
 			}
+			clos = append(clos, "T_scheme_overtime")
 		}
 
+		// 通知 实施人员进场
+		_, company_r := Account.Read_User_ByT_uuid(r.T_uuid)
+		System.Add_News(r.T_collection, fmt.Sprintf("【%s-%s】验证方案 已提交", company_r.T_name, r.T_name), "")
+		go wx.WxSend(r.T_collection, fmt.Sprintf("【%s-%s】验证方案 已提交", company_r.T_name, r.T_name))
+
 	}
 	if len(T_doc2) > 0 {
 		r.T_doc2 = T_doc2
@@ -1097,22 +1184,37 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_reporting_state")
 		// 添加已提交状态验证报告记录
 		auditRecordJson, err := Task.Add_AuditRecord(r.T_reporting_audit_record, "", User_r.T_uuid, r.T_reporting_state, "", "")
-		if err != nil {
-			return
-		}
-		r.T_reporting_audit_record = auditRecordJson
-		clos = append(clos, "T_reporting_audit_record")
-		r.T_reporting_end_time = time.Now().Format("2006-01-02 15:04:05")
-		clos = append(clos, "T_reporting_end_time")
-		if len(r.T_reporting_start_time) > 0 {
-			r.T_reporting_time_interval, _ = lib.MinutesDifference(r.T_reporting_start_time, r.T_reporting_end_time)
-			clos = append(clos, "T_reporting_time_interval")
-			// 所需时间 > 超时时间
-			if r.T_reporting_time_interval > Task.TaskReportingTimeLimit[r.T_report_type] && len(r.T_report_type) > 0 {
-				r.T_reporting_overtime = r.T_reporting_time_interval - Task.TaskReportingTimeLimit[r.T_report_type] // 超时时间
-				clos = append(clos, "T_reporting_overtime")
+		if err == nil {
+			r.T_reporting_audit_record = auditRecordJson
+			clos = append(clos, "T_reporting_audit_record")
+			r.T_reporting_end_time = time.Now().Format("2006-01-02 15:04:05")
+			clos = append(clos, "T_reporting_end_time")
+			if len(r.T_reporting_start_time) > 0 {
+				r.T_reporting_time_interval, _ = lib.MinutesDifference(r.T_reporting_start_time, r.T_reporting_end_time)
+				clos = append(clos, "T_reporting_time_interval")
+				// 扣除暂停时间
+				Task_Compute := Task.Read_TaskTime_Compute(r.T_task_id, 2)
+				if Task_Compute > 0 {
+					r.T_reporting_time_interval -= float64(Task_Compute)
+				}
+				clos = append(clos, "T_reporting_time_interval")
+				// 所需时间 > 超时时间
+				if r.T_reporting_time_interval > Task.TaskReportingTimeLimit[r.T_report_type] && len(r.T_report_type) > 0 {
+					r.T_reporting_overtime = r.T_reporting_time_interval - Task.TaskReportingTimeLimit[r.T_report_type] // 超时时间
+					if Task.TaskReportingTimeLimit[r.T_report_type] == 0 {
+						r.T_reporting_overtime = 0
+					}
+					clos = append(clos, "T_reporting_overtime")
+				}
+
 			}
 		}
+
+		// 通知 报告人员
+		_, company_r := Account.Read_User_ByT_uuid(r.T_uuid)
+		System.Add_News(r.T_delivery, fmt.Sprintf("【%s-%s】验证报告 已提交", company_r.T_name, r.T_name), "")
+		go wx.WxSend(r.T_delivery, fmt.Sprintf("【%s-%s】验证报告 已提交", company_r.T_name, r.T_name))
+
 	}
 	if len(T_doc3) > 0 {
 		r.T_doc3 = T_doc3
@@ -1156,28 +1258,21 @@ func (c *TaskController) Up() {
 		clos = append(clos, "T_CalibrationExpirationTime")
 	}
 
-	if len(T_sn) > 0 && len(T_CalibrationExpirationTime) > 0 {
-		err := NatsServer.Cold_UpdateDevice_CalibrationTime(T_sn, T_CalibrationExpirationTime)
-		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
-			c.ServeJSON()
-			return
-		}
-	}
-
 	// 从3.0获取校准时间
 	if len(T_sn) > 0 && len(T_CalibrationExpirationTime) == 0 {
-		device, err := NatsServer.Cold_ReadDeviceByT_sn(T_sn)
-		if err != nil {
-			err = errors.New("获取SN信息失败，请检查SN是否正确！")
-			c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
-			c.ServeJSON()
-			return
-		}
-		if !device.T_CalibrationTime.IsZero() {
-			r.T_CalibrationExpirationTime = device.T_CalibrationTime.Format("2006-01-02")
-			clos = append(clos, "T_CalibrationExpirationTime")
-		}
+
+		go func(r Task.Task,T_sn ,T_CalibrationExpirationTime string) {
+			NatsServer.Cold_UpdateDevice_CalibrationTime(T_sn, T_CalibrationExpirationTime)
+			device, err := NatsServer.Cold_ReadDeviceByT_sn(T_sn)
+			if err == nil {
+				if !device.T_CalibrationTime.IsZero() {
+					r.T_CalibrationExpirationTime = device.T_CalibrationTime.Format("2006-01-02")
+					clos = append(clos, "T_CalibrationExpirationTime")
+					Task.Update_Task(r, "T_CalibrationExpirationTime")
+				}
+			}
+		}(r,T_sn,T_CalibrationExpirationTime)
+
 	}
 
 	if len(T_project) > 0 {
@@ -1236,6 +1331,10 @@ func (c *TaskController) Up() {
 		r.T_report_number = T_report_number
 		clos = append(clos, "T_report_number")
 	}
+	if len(T_report_type) > 0 {
+		r.T_report_type = T_report_type
+		clos = append(clos, "T_report_type")
+	}
 
 	if !Task.Update_Task(r, clos...) {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
@@ -1338,19 +1437,37 @@ func (c *TaskController) UpSchemeState() {
 		return
 	}
 
-	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
+	//AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
+	// 已提交
+	if T_scheme_state == Task.TaskSchemeStateSubmitted {
+		System.Add_News(r.T_collection, fmt.Sprintf("【%s-%s】验证方案 %s,请尽快与客户沟通确定", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]), "")
+		go wx.WxSend(r.T_collection, fmt.Sprintf("【%s-%s】验证方案 %s,请尽快与客户沟通确定", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]))
+	}
 
-	if T_scheme_state == Task.TaskSchemeStateClientReturn ||
-		T_scheme_state == Task.TaskSchemeStateReturn ||
-		T_scheme_state == Task.TaskSchemeStatePass ||
-		T_scheme_state == Task.TaskSchemeStateClientPass {
-		System.Add_News(r.T_scheme, fmt.Sprintf("【验证方案】您提交的验证方案【%s-%s】 %s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]), "")
-		go System.Send_Weichat_News(AdminMap[r.T_scheme], fmt.Sprintf("【验证方案】您提交的验证方案【%s-%s】 %s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]), "")
+	// 已通过
+	if T_scheme_state == Task.TaskSchemeStatePass {
+		infoCollection, _ := InfoCollection.Read_InfoCollection(r.T_InfoCollection_id)
+		System.Add_News(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】验证方案 %s,请尽快与客户沟通确定", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]), "")
+		go wx.WxSend(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】验证方案 %s,请尽快与客户沟通确定", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state]))
 	}
 
-	if T_scheme_state == Task.TaskSchemeStateClientPass {
-		System.Add_News(r.T_collection, fmt.Sprintf("【%s-%s】验证方案客户已通过，可以进场实施，请到平台进行查看验证方案，确认好后选择进场时间", company_r.T_name, r.T_name), "")
-		go System.Send_Weichat_News(AdminMap[r.T_collection], fmt.Sprintf("【%s-%s】验证方案客户已通过，可以进场实施，请到平台进行查看验证方案，确认好后选择进场时间", company_r.T_name, r.T_name), "")
+
+	// 已退回(负责人)
+	if T_scheme_state == Task.TaskSchemeStateReturn {
+		System.Add_News(r.T_scheme, fmt.Sprintf("【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state],T_reason), "")
+		go wx.WxSend(r.T_scheme, fmt.Sprintf("【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state],T_reason))
+	}
+
+
+	//  已退回(客户)
+	if T_scheme_state == Task.TaskSchemeStateClientReturn {
+		System.Add_News(r.T_scheme, fmt.Sprintf("！！！【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state],T_reason), "")
+		go wx.WxSend(r.T_scheme, fmt.Sprintf("！！！【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name,Task.TaskSchemeStateMap[T_scheme_state],T_reason))
+
+		System.Add_News(conf.VdelUuid, fmt.Sprintf("！！！【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name, Task.TaskSchemeStateMap[T_scheme_state],T_reason), "")
+		go wx.WxSend(conf.VdelUuid, fmt.Sprintf("！！！【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name,Task.TaskSchemeStateMap[T_scheme_state],T_reason))
+
+		go wx.WxSend(conf.BoosUuid, fmt.Sprintf("！！！【%s-%s】验证方案 %s,%s", company_r.T_name, r.T_name,Task.TaskSchemeStateMap[T_scheme_state],T_reason))
 	}
 
 	// 添加任务操作日志
@@ -1390,7 +1507,7 @@ func (c *TaskController) UpReportingState() {
 		c.ServeJSON()
 		return
 	}
-	_, user_r := Account.Read_User_ByT_uuid(r.T_uuid)
+	//_, user_r := Account.Read_User_ByT_uuid(r.T_uuid)
 
 	clos := make([]string, 0)
 	if T_reporting_state > 0 {
@@ -1444,11 +1561,20 @@ func (c *TaskController) UpReportingState() {
 	r.T_reporting_audit_record = auditRecordJson
 
 	clos = append(clos, "T_reporting_audit_record")
-
+	// 查询信息采集信息
+	infoCollection, is := InfoCollection.Read_InfoCollection(r.T_InfoCollection_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取信息采集失败!"}
+		c.ServeJSON()
+		return
+	}
 	// 验证报告客户审核通过后设置结束时间
 	if T_reporting_state == Task.TaskReportingStateClientPass {
 		r.T_end_time = time.Now().Format("2006-01-02 15:04:05")
-		r.T_time_interval, _ = lib.MinutesDifference(r.T_start_time, r.T_end_time)
+		r.T_time_interval, err = lib.MinutesDifference(infoCollection.T_start_time, r.T_end_time)
+		if err != nil {
+			logs.Error("UpReportingState:", err.Error())
+		}
 		clos = append(clos, "T_end_time")
 		clos = append(clos, "T_time_interval")
 	}
@@ -1459,13 +1585,41 @@ func (c *TaskController) UpReportingState() {
 		return
 	}
 
-	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
-	if T_reporting_state == Task.TaskSchemeStateClientReturn ||
-		T_reporting_state == Task.TaskSchemeStateReturn ||
-		T_reporting_state == Task.TaskSchemeStatePass ||
-		T_reporting_state == Task.TaskSchemeStateClientPass {
-		System.Add_News(r.T_scheme, fmt.Sprintf("【验证报告】您提交的验证报告【%s-%s】 %s", user_r.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]), "")
-		go System.Send_Weichat_News(AdminMap[r.T_scheme], fmt.Sprintf("【验证报告】您提交的验证报告【%s-%s】 %s", user_r.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]), "")
+	// 已通过
+	if T_reporting_state == Task.TaskReportingStatePass {
+		System.Add_News(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】验证报告 %s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]), "")
+		go wx.WxSend(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】验证报告 %s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state]))
+
+		System.Add_News(r.T_reporting, fmt.Sprintf("【%s-%s】验证报告 %s,请及时 打印报告", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]), "")
+		go wx.WxSend(r.T_reporting, fmt.Sprintf("【%s-%s】验证报告 %s,请及时 打印报告", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state]))
+	}
+	// 已退回
+	if T_reporting_state == Task.TaskReportingStateReturn {
+		System.Add_News(r.T_reporting, fmt.Sprintf("【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason), "")
+		go wx.WxSend(r.T_reporting, fmt.Sprintf("【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state],T_reason))
+	}
+	// 已通过(客户)  通知销售
+	if T_reporting_state == Task.TaskReportingStateClientPass {
+		go wx.WxSend(infoCollection.T_submit_uuid, fmt.Sprintf("【%s-%s】 %s,请尽快安排客户回款", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]))
+	}
+
+	if T_reporting_state == Task.TaskReportingStateClientReturn {
+		System.Add_News(r.T_scheme, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason), "")
+		go wx.WxSend(r.T_scheme, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state],T_reason))
+
+		System.Add_News(r.T_collection, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason), "")
+		go wx.WxSend(r.T_collection, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state],T_reason))
+
+		System.Add_News(r.T_reporting, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason), "")
+		go wx.WxSend(r.T_reporting, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state],T_reason))
+
+		//System.Add_News(r.T_delivery, fmt.Sprintf("！！！【%s-%s】验证报告 %s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state]), "")
+		//go wx.WxSend(r.T_delivery, fmt.Sprintf("！！！【%s-%s】验证报告 %s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state]))
+
+		System.Add_News(conf.VdelUuid, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason), "")
+		go wx.WxSend(conf.VdelUuid, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name,Task.TaskReportingStateMap[T_reporting_state],T_reason))
+
+		go wx.WxSend(conf.BoosUuid, fmt.Sprintf("！！！【%s-%s】验证报告 %s,%s", infoCollection.T_name, r.T_name, Task.TaskReportingStateMap[T_reporting_state],T_reason))
 	}
 
 	// 添加任务操作日志
@@ -1476,7 +1630,7 @@ func (c *TaskController) UpReportingState() {
 	return
 }
 
-// 进场
+// 进场  改成 方案开始
 func (c *TaskController) EnterArea() {
 	// 验证登录 User_is, User_r
 	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
@@ -1487,7 +1641,6 @@ func (c *TaskController) EnterArea() {
 	}
 
 	T_task_id := c.GetString("T_task_id")
-	T_time := c.GetString("T_time") // 进场时间
 	r, is := Task.Read_Task(T_task_id)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
@@ -1495,15 +1648,15 @@ func (c *TaskController) EnterArea() {
 		return
 	}
 
-	r.T_enter_area_time = T_time
-	if !Task.Update_Task(r, "T_enter_area_time") {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改进场时间失败!"}
-		c.ServeJSON()
-		return
+	// 方案开始
+	if len(r.T_scheme_start_time) == 0 {
+		r.T_scheme_start_time = time.Now().Format("2006-01-02 15:04:05")
+		Task.Update_Task(r,"T_scheme_start_time")
 	}
+
 	// 添加任务操作日志
-	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "进场", r)
-	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "进场", r)
+	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务管理", "方案开始", r)
+	System.Add_UserLogs_T(User_r.T_uuid, "任务管理", "方案开始", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
 	return
@@ -2009,7 +2162,7 @@ func horizontalLine(xmin, xmax, y float64) *plotter.Line {
 	pts[1].Y = y
 	line, err := plotter.NewLine(pts)
 	if err != nil {
-		panic(err)
+		panic(any(err))
 	}
 	line.LineStyle.Dashes = []vg.Length{vg.Points(8), vg.Points(5), vg.Points(1), vg.Points(5)}
 	line.Color = color.RGBA{R: 255, A: 255}
@@ -2115,3 +2268,260 @@ func GetWatermarkPdf(task Task.Task, pdfURL string, flag string) (pdf string) {
 
 	return
 }
+
+// 暂停申请
+// 列表 -
+func (c *TaskController) TaskTimeList() {
+	// 验证登录 User_is, User_r
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+
+		return
+	}
+
+	var r_jsons lib.R_JSONS
+
+	T_task_id := c.GetString("T_task_id")
+	T_task_type, _ := c.GetInt("T_task_type", 0) // 公司名称
+
+	var cnt int64
+	List, cnt := Task.Read_TaskTime_List(T_task_id, T_task_type)
+
+	r_jsons.List = List
+	r_jsons.Num = int(cnt)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}
+
+// 添加-
+func (c *TaskController) TaskTimeAdd() {
+
+	// 验证登录 User_is, User_r
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	dc := Device.DeviceClass{
+		T_uuid:  User_r.T_uuid,
+		T_State: 1,
+	}
+
+	System.Add_UserLogs_T(User_r.T_uuid, "任务暂停", "暂停申请", dc)
+
+	T_task_id := c.GetString("T_task_id")
+
+	T_task_type, _ := c.GetInt("T_task_type", 0) // 公司名称
+	T_aaa := c.GetString("T_aaa")
+
+	var_ := Task.TaskTime{
+		T_task_id:    T_task_id,
+		T_task_type:  T_task_type,
+		T_uuid:       User_r.T_uuid,
+		T_remarks:    T_aaa,
+		T_start_time: time.Now().Format("2006-01-02 15:04:05"),
+	}
+	List, _ := Task.Read_TaskTime_List(T_task_id, T_task_type)
+	if len(List) > 0 {
+		if len(List[len(List)-1].T_end_time) == 0 {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "上一个任务还没结束!"}
+			c.ServeJSON()
+			return
+		}
+	}
+
+	is := Task.Add_TaskTime(var_)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
+		c.ServeJSON()
+		return
+	}
+
+	// 添加任务操作日志
+	Task.Add_TaskLogs_T(User_r.T_uuid, T_task_id, "任务暂停", "暂停申请", var_)
+	System.Add_UserLogs_T(User_r.T_uuid, "任务暂停", "暂停申请", var_)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: T_task_id}
+	c.ServeJSON()
+	return
+}
+
+// 添加-
+func (c *TaskController) TaskTimeEnd() {
+
+	// 验证登录 User_is, User_r
+	User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	dc := Device.DeviceClass{
+		T_uuid:  User_r.T_uuid,
+		T_State: 1,
+	}
+
+	System.Add_UserLogs_T(User_r.T_uuid, "任务暂停", "暂停结束", dc)
+
+	Id, _ := c.GetInt("Id", 0)
+
+	TaskTime_r, is := Task.Read_TaskTime_ById(Id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+	TaskTime_r.T_end_time = time.Now().Format("2006-01-02 15:04:05")
+	is = Task.Update_TaskTime(TaskTime_r, "T_end_time")
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
+		c.ServeJSON()
+		return
+	}
+	// 添加任务操作日志
+	Task.Add_TaskLogs_T(User_r.T_uuid, TaskTime_r.T_task_id, "任务暂停", "暂停结束", TaskTime_r)
+	System.Add_UserLogs_T(User_r.T_uuid, "任务暂停", "暂停结束", TaskTime_r)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: TaskTime_r.T_task_id}
+	c.ServeJSON()
+	return
+}
+
+// 列表 - 统计排名
+func (c *TaskController) StatisticalRanking() {
+	// 验证登录 User_is, User_r
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_power, _ := c.GetInt("T_power", 0) // 5	数据采集工程师   6	验证报告工程师
+	type Admin_T struct {
+		T_name string
+
+		T_scheme           int    // 实施方案
+		T_scheme_returnnum int    // 退回
+		T_scheme_overnum   int    // 超时
+		T_scheme_log       string // 日志
+
+		T_collection           int    // 数据采集
+		T_collection_returnnum int    // 退回
+		T_collection_overnum   int    // 超时
+		T_collection_log       string // 日志
+
+		T_reporting           int    // 报告编写
+		T_reporting_returnnum int    // 退回
+		T_reporting_overnum   int    // 超时
+		T_reporting_log       string // 日志
+
+		T_rejectdnum int // 驳回数量
+
+	}
+
+	var Admin_T_List []Admin_T
+	Admin_List := Account.Read_Admin_List_ALL_T_power(T_power)
+	for _, A := range Admin_List {
+		Admin_t := Admin_T{T_name: A.T_name}
+
+		// 方案
+		Task_List := Task.Read_UserTask_StatisticalRanking(A.T_uuid, "T_scheme") //T_scheme   T_collection   T_reporting
+		for _, T := range Task_List {
+			if len(T.T_scheme_end_time) > 0 {
+				if is, _ := lib.IsInCurrentMonth(T.T_scheme_end_time); !is {
+					continue // 不是本月
+				}
+				Admin_t.T_scheme += 1
+				Admin_t.T_scheme_log += T.T_name
+				// 退回
+				if T.T_scheme_return_times > 0 {
+					Admin_t.T_scheme_returnnum += T.T_scheme_return_times
+					Admin_t.T_scheme_log += " | 退回"+ lib.To_string(int(T.T_scheme_return_times))
+				}
+				// 超时
+				if T.T_scheme_overtime > 0 {
+					Admin_t.T_scheme_overnum += 1
+					Admin_t.T_scheme_log += " | 超时"+ lib.ConvertMinutesToDHM(int(T.T_scheme_overtime))
+				}
+				// 驳回
+				if T.T_reject_times > 0 {
+					Admin_t.T_rejectdnum += T.T_reject_times
+					Admin_t.T_scheme_log += " | 驳回"+ lib.To_string(int(T.T_reject_times))
+				}
+
+				Admin_t.T_scheme_log += "\n"
+			}
+		}
+		// 实施
+		Task_List = Task.Read_UserTask_StatisticalRanking(A.T_uuid, "T_collection") //T_scheme   T_collection   T_reporting
+		for _, T := range Task_List {
+			if len(T.T_collection_end_time) > 0 {
+				if is, _ := lib.IsInCurrentMonth(T.T_collection_end_time); !is {
+					continue // 不是本月
+				}
+				Admin_t.T_collection += 1
+				Admin_t.T_collection_log += T.T_name
+				// 退回
+				if T.T_collection_return_times > 0 {
+					Admin_t.T_collection_returnnum += T.T_collection_return_times
+					Admin_t.T_collection_log += " | 退回"+ lib.To_string(int(T.T_collection_return_times))
+				}
+				// 超时
+				if T.T_collection_overtime > 0 {
+					Admin_t.T_collection_overnum += 1
+					Admin_t.T_collection_log += " | 超时"+ lib.ConvertMinutesToDHM(int(T.T_collection_overtime))
+				}
+				// 驳回
+				if T.T_reject_times > 0 {
+					Admin_t.T_rejectdnum += T.T_reject_times
+					Admin_t.T_collection_log += " | 驳回"+ lib.To_string(int(T.T_reject_times))
+				}
+
+				Admin_t.T_collection_log += "\n"
+			}
+		}
+		// 报告
+		Task_List = Task.Read_UserTask_StatisticalRanking(A.T_uuid, "T_reporting") //T_scheme   T_collection   T_reporting
+		for _, T := range Task_List {
+			if len(T.T_reporting_end_time) > 0 {
+				if is, _ := lib.IsInCurrentMonth(T.T_reporting_end_time); !is {
+					continue // 不是本月
+				}
+				Admin_t.T_reporting += 1
+				Admin_t.T_reporting_log += T.T_name
+				// 退回
+				if T.T_reporting_return_times > 0 {
+					Admin_t.T_reporting_returnnum += T.T_reporting_return_times
+					Admin_t.T_reporting_log += " | 退回"+ lib.To_string(int(T.T_reporting_return_times))
+				}
+				// 超时
+				if T.T_reporting_overtime > 0 {
+					Admin_t.T_reporting_overnum += 1
+					Admin_t.T_reporting_log += " | 超时"+ lib.ConvertMinutesToDHM(int(T.T_reporting_overtime))
+				}
+				// 驳回
+				if T.T_reject_times > 0 {
+					Admin_t.T_rejectdnum += T.T_reject_times
+					Admin_t.T_reporting_log += " | 驳回"+ lib.To_string(int(T.T_reject_times))
+				}
+				Admin_t.T_reporting_log += "\n"
+			}
+		}
+		Admin_T_List = append(Admin_T_List, Admin_t)
+	}
+
+	var r_jsons lib.R_JSONS
+	r_jsons.List = Admin_T_List
+	r_jsons.Page = 0
+	r_jsons.Page_size = 0
+	r_jsons.Pages = lib.Func_page(int64(0), int64(0))
+	r_jsons.Num = 0
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}

controllers/TaskData.go

@@ -1439,13 +1439,7 @@ func listSubtract(sliceA, sliceB []Device.DeviceClassList) []Device.DeviceClassL
 
 	return result
 }
-func chunkBy1[T any](list []T, size int) [][]T {
-	var chunks [][]T
-	for size < len(list) {
-		list, chunks = list[size:], append(chunks, list[0:size:size])
-	}
-	return append(chunks, list)
-}
+
 func splitData(data []Device.DeviceClassList, threshold float64, idWidthMap map[string]float64) [][]Device.DeviceClassList {
 	var result [][]Device.DeviceClassList
 	var currentBatch []Device.DeviceClassList

controllers/VerifyTemplate.go

@@ -114,6 +114,7 @@ func (c *VerifyTemplateController) Up() {
 	T_inspect := c.GetString("T_inspect")
 	T_marking := c.GetString("T_marking")
 	T_cover := c.GetString("T_cover")
+	T_deploy := c.GetString("T_deploy")
 
 	r, is := VerifyTemplate.Read_VerifyTemplate(T_VerifyTemplate_id)
 	if !is {
@@ -142,12 +143,15 @@ func (c *VerifyTemplateController) Up() {
 	if len(T_cover) > 0 {
 		r.T_cover = T_cover
 	}
+	if len(T_deploy) > 0 {
+		r.T_deploy = T_deploy
+	}
 	if T_sort_err == nil {
 		r.T_sort = T_sort
 	}
 
 	// .......
-	if !VerifyTemplate.Update_VerifyTemplate(r, "T_name", "T_sort", "T_scheme", "T_reporting", "T_inspect", "T_marking", "T_cover") {
+	if !VerifyTemplate.Update_VerifyTemplate(r, "T_name", "T_sort", "T_scheme", "T_reporting", "T_inspect", "T_marking", "T_cover", "T_deploy") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -197,6 +201,31 @@ func (c *VerifyTemplateController) Del() {
 
 }
 
+// 删除-
+func (c *VerifyTemplateController) Get() {
+	// 验证登录 User_is, User_r
+	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_VerifyTemplate_id := c.GetString("T_VerifyTemplate_id")
+
+	r, is := VerifyTemplate.Read_VerifyTemplate(T_VerifyTemplate_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
+		c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.VerifyTemplateToVerifyTemplate_R(r)}
+	c.ServeJSON()
+	return
+
+}
+
 // 复制-
 func (c *VerifyTemplateController) Copy() {
 	// 验证登录 User_is, User_r
@@ -220,6 +249,7 @@ func (c *VerifyTemplateController) Copy() {
 		T_class: r.T_class,
 		T_name:  T_name,
 		T_sort:  r.T_sort,
+		T_deploy:  r.T_deploy,
 	}
 
 	new_id, is := VerifyTemplate.Add_VerifyTemplate(var_)
@@ -260,6 +290,8 @@ func (c *VerifyTemplateController) Copy() {
 			T_label:             v.T_label,
 			T_source:            v.T_source,
 			T_sort:              v.T_sort,
+			T_Required:          v.T_Required,
+			T_Construction:      v.T_Construction,
 			T_flow_sort:         v.T_flow_sort,
 			T_max_time:          v.T_max_time,
 			T_min_time:          v.T_min_time,
@@ -337,6 +369,8 @@ func (c *VerifyTemplateController) Map_Add() {
 	T_label, _ := c.GetInt("T_label")
 	T_source, _ := c.GetInt("T_source")
 	T_sort, _ := c.GetInt("T_sort")
+	T_Required, _ := c.GetInt("T_Required")
+	T_Construction, _ := c.GetInt("T_Construction")
 	T_flow_sort, _ := c.GetInt("T_flow_sort")
 	T_max_time, _ := c.GetInt("T_max_time")
 	T_min_time, _ := c.GetInt("T_min_time")
@@ -348,6 +382,8 @@ func (c *VerifyTemplateController) Map_Add() {
 		T_label:             T_label,
 		T_source:            T_source,
 		T_sort:              T_sort,
+		T_Required:          T_Required,
+		T_Construction:      T_Construction,
 		T_flow_sort:         T_flow_sort,
 		T_max_time:          T_max_time,
 		T_min_time:          T_min_time,
@@ -382,6 +418,8 @@ func (c *VerifyTemplateController) Map_Up() {
 	T_label, T_label_err := c.GetInt("T_label")
 	T_sort, T_sort_err := c.GetInt("T_sort")
 	T_source, T_source_err := c.GetInt("T_source")
+	T_Required, _ := c.GetInt("T_Required")
+	T_Construction, _ := c.GetInt("T_Construction")
 
 	T_min_time, T_min_time_err := c.GetInt("T_min_time")
 	T_max_time, T_max_time_err := c.GetInt("T_max_time")
@@ -422,8 +460,9 @@ func (c *VerifyTemplateController) Map_Up() {
 	if T_flow_sort_err == nil {
 		r.T_flow_sort = T_flow_sort
 	}
-
-	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_sort", "T_source", "T_min_time", "T_max_time", "T_flow_sort") {
+	r.T_Required = T_Required
+	r.T_Construction = T_Construction
+	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_sort", "T_source", "T_min_time", "T_max_time", "T_flow_sort", "T_Required", "T_Construction") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -515,7 +554,7 @@ func (c *VerifyTemplateController) Map_Data_List() {
 // 添加标签数据
 func (c *VerifyTemplateController) Map_Data_Pu() {
 	//验证登录 User_is, User_r
-
+	var err error
 	//token := c.Ctx.Request.Header.Get("user_tokey")
 	//User_r, User_is := Account.Verification_Admin(token, "")
 	//if !User_is {
@@ -523,6 +562,13 @@ func (c *VerifyTemplateController) Map_Data_Pu() {
 	//	c.ServeJSON()
 	//	return
 	//}
+	//err = albb.DescribeInstances()
+	////err := RunInstances(tea.StringSlice(os.Args[1:]))
+	//if err != nil {
+	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "服务启动失败!"}
+	//	c.ServeJSON()
+	//	return
+	//}
 
 	type RequestBody struct {
 		User_tokey            string
@@ -535,7 +581,7 @@ func (c *VerifyTemplateController) Map_Data_Pu() {
 
 	var body RequestBody
 	data := c.Ctx.Input.RequestBody
-	err := json.Unmarshal(data, &body)
+	err = json.Unmarshal(data, &body)
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "json返序列化失败:" + err.Error()}
 		c.ServeJSON()
@@ -571,10 +617,11 @@ func (c *VerifyTemplateController) Map_Data_Pu() {
 			T_task_id:              body.T_task_id,
 			T_VerifyTemplate_id:    body.T_VerifyTemplate_id,
 			T_VerifyTemplateMap_id: v.T_VerifyTemplateMap_id,
-
-			T_flow_sort: v.T_flow_sort,
-			T_max_time:  v.T_max_time,
-			T_min_time:  v.T_min_time,
+			T_Required:             v.T_Required,
+			T_Construction:         v.T_Construction,
+			T_flow_sort:            v.T_flow_sort,
+			T_max_time:             v.T_max_time,
+			T_min_time:             v.T_min_time,
 
 			T_value:      v.T_value,
 			T_start_time: v.T_start_time,
@@ -643,6 +690,8 @@ func (c *VerifyTemplateController) Map_Data_Copy() {
 			T_task_id:              paste_task.T_task_id,
 			T_VerifyTemplate_id:    paste_task.T_VerifyTemplate_id,
 			T_VerifyTemplateMap_id: v.T_VerifyTemplateMap_id,
+			T_Required:             v.T_Required,
+			T_Construction:         v.T_Construction,
 
 			T_flow_sort: v.T_flow_sort,
 			T_max_time:  v.T_max_time,
@@ -822,6 +871,8 @@ func (c *VerifyTemplateController) Map_Data_History_Recover() {
 			T_task_id:              task.T_task_id,
 			T_VerifyTemplate_id:    task.T_VerifyTemplate_id,
 			T_VerifyTemplateMap_id: v.T_VerifyTemplateMap_id,
+			T_Required:             v.T_Required,
+			T_Construction:         v.T_Construction,
 
 			T_flow_sort: v.T_flow_sort,
 			T_max_time:  v.T_max_time,

controllers/infoCollection.go

@@ -4,6 +4,7 @@ import (
 	"ColdVerify_server/Nats/NatsServer"
 	"ColdVerify_server/conf"
 	"ColdVerify_server/lib"
+	"ColdVerify_server/lib/wx"
 	"ColdVerify_server/logs"
 	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/InfoCollection"
@@ -273,7 +274,7 @@ func (c *InfoCollectionController) UpStatus() {
 		c.ServeJSON()
 		return
 	}
-	_, user_r := Account.Read_User_ByT_uuid(r.T_uuid)
+	//_, user_r := Account.Read_User_ByT_uuid(r.T_uuid)
 
 	if T_status == InfoCollection.InfoCollectionStatusSubmitted && (r.T_status != InfoCollection.InfoCollectionStatusWaitSubmit && r.T_status != InfoCollection.InfoCollectionStatusReturn) {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("当前状态为%s，禁止提交为%s", InfoCollection.InfoCollectionStatusMap[r.T_status], InfoCollection.InfoCollectionStatusMap[T_status])}
@@ -305,7 +306,15 @@ func (c *InfoCollectionController) UpStatus() {
 		r.T_status = T_status
 		clos = append(clos, "T_status")
 	}
-
+	//  2已提交  ，计算时间
+	if T_status == InfoCollection.InfoCollectionStatusSubmitted{
+		if len(r.T_end_time) == 0 {
+			r.T_end_time = time.Now().Format("2006-01-02 15:04:05")
+			r.T_time_interval, _ = lib.MinutesDifference(r.T_start_time, r.T_end_time)
+			clos = append(clos, "T_end_time")
+			clos = append(clos, "T_time_interval")
+		}
+	}
 	if T_status == InfoCollection.InfoCollectionStatusReturn {
 		r.T_return_times += 1
 		clos = append(clos, "T_return_times")
@@ -338,11 +347,24 @@ func (c *InfoCollectionController) UpStatus() {
 		c.ServeJSON()
 		return
 	}
-	AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
-	if T_status == InfoCollection.InfoCollectionStatusReceipt || T_status == InfoCollection.InfoCollectionStatusReturn {
-		System.Add_News(r.T_submit_uuid, fmt.Sprintf("【信息采集】您提交的信息采集【%s-%s】%s", user_r.T_name, r.T_name, InfoCollection.InfoCollectionStatusMap[T_status]), "")
-		go System.Send_Weichat_News(AdminMap[r.T_submit_uuid], fmt.Sprintf("【信息采集】您提交的信息采集【%s-%s】%s", user_r.T_name, r.T_name, InfoCollection.InfoCollectionStatusMap[T_status]), "")
+	//AdminMap := Account.AdminListToMap(Account.Read_Admin_List_ALL_1())
+	_, company_r := Account.Read_User_ByT_uuid(r.T_uuid)
+	// 已提交   [报告负责人]
+	if T_status == InfoCollection.InfoCollectionStatusSubmitted {
+		go wx.WxSend(conf.VdelUuid, fmt.Sprintf("【%s-%s】信息采集 %s", company_r.T_name, r.T_name,InfoCollection.InfoCollectionStatusMap[T_status]))
 	}
+
+	// 已退回
+	if T_status == InfoCollection.InfoCollectionStatusReturn {
+		System.Add_News(r.T_submit_uuid, fmt.Sprintf("【%s-%s】信息采集 %s,%s", company_r.T_name, r.T_name,InfoCollection.InfoCollectionStatusMap[T_status],T_reason), "")
+		go wx.WxSend(r.T_submit_uuid, fmt.Sprintf("【%s-%s】信息采集 %s,%s", company_r.T_name, r.T_name,InfoCollection.InfoCollectionStatusMap[T_status],T_reason))
+	}
+
+	if T_status == InfoCollection.InfoCollectionStatusReturnedMoney {
+		go wx.WxSend(conf.BoosUuid, fmt.Sprintf("【%s-%s】已回款", company_r.T_name, r.T_name))
+	}
+
+
 	System.Add_UserLogs_T(User_r.T_uuid, "信息采集管理", "修改状态", r)
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()

go.mod

@@ -1,8 +1,12 @@
 module ColdVerify_server
 
-go 1.21
+go 1.23
 
 require (
+	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.10
+	github.com/alibabacloud-go/openapi-util v0.1.1
+	github.com/alibabacloud-go/tea v1.3.1
+	github.com/alibabacloud-go/tea-utils/v2 v2.0.7
 	github.com/astaxie/beego v1.12.3
 	github.com/beego/beego/v2 v2.0.7
 	github.com/go-resty/resty/v2 v2.11.0
@@ -10,6 +14,7 @@ require (
 	github.com/google/uuid v1.2.0
 	github.com/nats-io/nats.go v1.27.0
 	github.com/qiniu/go-sdk/v7 v7.14.0
+	github.com/robfig/cron/v3 v3.0.1
 	github.com/satori/go.uuid v1.2.0
 	github.com/signintech/gopdf v0.15.1
 	github.com/vmihailenco/msgpack/v5 v5.3.5
@@ -20,8 +25,13 @@ require (
 require (
 	git.sr.ht/~sbinet/gg v0.4.1 // indirect
 	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
+	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect
+	github.com/alibabacloud-go/debug v1.0.1 // indirect
+	github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
+	github.com/aliyun/credentials-go v1.3.10 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/go-fonts/liberation v0.3.1 // indirect
 	github.com/go-latex/latex v0.0.0-20230307184459-12ec69307ad9 // indirect
 	github.com/go-pdf/fpdf v0.8.0 // indirect
@@ -29,9 +39,12 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.5 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/nats-io/nats-server/v2 v2.9.20 // indirect
 	github.com/nats-io/nkeys v0.4.4 // indirect
@@ -45,6 +58,7 @@ require (
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
@@ -55,6 +69,7 @@ require (
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -47,8 +47,55 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 h1:eIf+iGJxdU4U9ypaUfbtOWCsZSbTb8AUHvyPrxu6mAA=
+github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo=
+github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc=
+github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 h1:zE8vH9C7JiZLNJJQ5OwjU9mSi4T9ef9u3BURT6LCLC8=
+github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5/go.mod h1:tWnyE9AjF8J8qqLk645oUmVUnFybApTQWklQmi5tY6g=
+github.com/alibabacloud-go/darabonba-array v0.1.0 h1:vR8s7b1fWAQIjEjWnuF0JiKsCvclSRTfDzZHTYqfufY=
+github.com/alibabacloud-go/darabonba-array v0.1.0/go.mod h1:BLKxr0brnggqOJPqT09DFJ8g3fsDshapUD3C3aOEFaI=
+github.com/alibabacloud-go/darabonba-encode-util v0.0.2 h1:1uJGrbsGEVqWcWxrS9MyC2NG0Ax+GpOM5gtupki31XE=
+github.com/alibabacloud-go/darabonba-encode-util v0.0.2/go.mod h1:JiW9higWHYXm7F4PKuMgEUETNZasrDM6vqVr/Can7H8=
+github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIpjmafa0qOTp6udc=
+github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc=
+github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.10 h1:GEYkMApgpKEVDn6z12DcH1EGYpDYRB8JxsazM4Rywak=
+github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.10/go.mod h1:26a14FGhZVELuz2cc2AolvW4RHmIO3/HRwsdHhaIPDE=
+github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg=
+github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ=
+github.com/alibabacloud-go/darabonba-string v1.0.2 h1:E714wms5ibdzCqGeYJ9JCFywE5nDyvIXIIQbZVFkkqo=
+github.com/alibabacloud-go/darabonba-string v1.0.2/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA=
+github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY=
+github.com/alibabacloud-go/debug v1.0.0/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc=
+github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA6GSbPg=
+github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc=
+github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q=
+github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE=
+github.com/alibabacloud-go/openapi-util v0.1.0/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
+github.com/alibabacloud-go/openapi-util v0.1.1 h1:ujGErJjG8ncRW6XtBBMphzHTvCxn4DjrVw4m04HsS28=
+github.com/alibabacloud-go/openapi-util v0.1.1/go.mod h1:/UehBSE2cf1gYT43GV4E+RxTdLRzURImCYY0aRmlXpw=
+github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg=
+github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
+github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
+github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4=
+github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
+github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
+github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
+github.com/alibabacloud-go/tea v1.3.1 h1:qdRKlZWj1b7agUnmMEYku+Mzjo37IJh3YmwUmIEzRC4=
+github.com/alibabacloud-go/tea v1.3.1/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
+github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
+github.com/alibabacloud-go/tea-utils/v2 v2.0.5/go.mod h1:dL6vbUT35E4F4bFTHL845eUloqaerYBYPsdWR2/jhe4=
+github.com/alibabacloud-go/tea-utils/v2 v2.0.6/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I=
+github.com/alibabacloud-go/tea-utils/v2 v2.0.7 h1:WDx5qW3Xa5ZgJ1c8NfqJkF6w+AU5wB8835UdhPr6Ax0=
+github.com/alibabacloud-go/tea-utils/v2 v2.0.7/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I=
+github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzYtqw7dgt0=
+github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw=
+github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0=
+github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM=
+github.com/aliyun/credentials-go v1.3.10 h1:45Xxrae/evfzQL9V10zL3xX31eqgLWEaIdCoPipOEQA=
+github.com/aliyun/credentials-go v1.3.10/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
 github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
 github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
 github.com/beego/beego/v2 v2.0.7 h1:9KNnUM40tn3pbCOFfe6SJ1oOL0oTi/oBS/C/wCEdAXA=
@@ -68,6 +115,9 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
+github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -170,8 +220,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -187,6 +237,8 @@ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -197,9 +249,11 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -230,9 +284,11 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
@@ -301,6 +357,8 @@ github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7
 github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN0AQoVM=
 github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
@@ -318,19 +376,27 @@ github.com/signintech/gopdf v0.15.1/go.mod h1:a+E8HlIuBwghPyoo7UaoB5UaL7zklDzmYV
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
+github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
+github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
+github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
@@ -345,6 +411,7 @@ github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 h1:OAmKAfT06//esDdpi/DZ8Q
 github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -359,11 +426,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -403,6 +479,9 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -432,6 +511,7 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -440,8 +520,15 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -463,6 +550,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -492,6 +582,7 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -514,15 +605,28 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -534,6 +638,9 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -547,6 +654,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -575,6 +683,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -584,6 +693,8 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -678,6 +789,9 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

lib/albb/DescribeInstances.go

@@ -0,0 +1,270 @@
+// This file is auto-generated, don't edit it. Thanks.
+package albb
+
+import (
+	"encoding/json"
+	"fmt"
+	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
+	openapiutil "github.com/alibabacloud-go/openapi-util/service"
+	util "github.com/alibabacloud-go/tea-utils/v2/service"
+	"github.com/alibabacloud-go/tea/tea"
+	"strings"
+	"time"
+)
+//查询实例的详细信息列表
+func ModifyInstanceAutoReleaseTime (InstanceId,AutoReleaseTime string) (_err error) {
+	fmt.Println("ModifyInstanceAutoReleaseTime:",InstanceId,AutoReleaseTime )
+	client, _err := CreateClient()
+	if _err != nil {
+		return _err
+	}
+
+	params := &openapi.Params{
+		// 接口名称
+		Action: tea.String("ModifyInstanceAutoReleaseTime"),
+		// 接口版本
+		Version: tea.String("2014-05-26"),
+		// 接口协议
+		Protocol: tea.String("HTTPS"),
+		// 接口 HTTP 方法
+		Method: tea.String("POST"),
+		AuthType: tea.String("AK"),
+		Style: tea.String("RPC"),
+		// 接口 PATH
+		Pathname: tea.String("/"),
+		// 接口请求体内容格式
+		ReqBodyType: tea.String("json"),
+		// 接口响应体内容格式
+		BodyType: tea.String("json"),
+	}
+	println("AutoReleaseTime:",AutoReleaseTime)
+
+	// query params
+	queries := map[string]interface{}{}
+	queries["RegionId"] = tea.String("cn-hangzhou")
+	queries["InstanceId"] = tea.String(InstanceId)
+	queries["AutoReleaseTime"] = tea.String(AutoReleaseTime)
+	// runtime options
+	runtime := &util.RuntimeOptions{}
+	request := &openapi.OpenApiRequest{
+		Query: openapiutil.Query(queries),
+	}
+	// 复制代码运行请自行打印 API 的返回值
+	// 返回值实际为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。
+	_result, _err := client.CallApi(params, request, runtime)
+	if _err != nil {
+		return _err
+	}
+	data, _ := json.Marshal(_result)
+	fmt.Println(string(data))
+	//fmt.Println("ccc",_result["body"].(map[string]interface{})["Instances"].(map[string]interface{})["Instance"])
+
+	return _err
+}
+//查询实例的详细信息列表
+func DescribeInstances () (_err error) {
+	client, _err := CreateClient()
+	if _err != nil {
+		return _err
+	}
+
+	params := &openapi.Params{
+		// 接口名称
+		Action: tea.String("DescribeInstances"),
+		// 接口版本
+		Version: tea.String("2014-05-26"),
+		// 接口协议
+		Protocol: tea.String("HTTPS"),
+		// 接口 HTTP 方法
+		Method: tea.String("POST"),
+		AuthType: tea.String("AK"),
+		Style: tea.String("RPC"),
+		// 接口 PATH
+		Pathname: tea.String("/"),
+		// 接口请求体内容格式
+		ReqBodyType: tea.String("json"),
+		// 接口响应体内容格式
+		BodyType: tea.String("json"),
+	}
+	// query params
+	queries := map[string]interface{}{}
+	queries["RegionId"] = tea.String("cn-hangzhou")
+	// runtime options
+	runtime := &util.RuntimeOptions{}
+	request := &openapi.OpenApiRequest{
+		Query: openapiutil.Query(queries),
+	}
+	// 复制代码运行请自行打印 API 的返回值
+	// 返回值实际为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。
+	_result, _err := client.CallApi(params, request, runtime)
+	if _err != nil {
+		return _err
+	}
+	data, _ := json.Marshal(_result)
+	fmt.Println(string(data))
+	//fmt.Println("ccc",_result["body"].(map[string]interface{})["Instances"].(map[string]interface{})["Instance"])
+	fmt.Println("len",len(_result["body"].(map[string]interface{})["Instances"].(map[string]interface{})["Instance"].([]interface {})))
+	find_ecs := false
+	for _,v := range _result["body"].(map[string]interface{})["Instances"].(map[string]interface{})["Instance"].([]interface {}){
+		fmt.Println("InstanceName:",v.(map[string]interface{})["InstanceName"],"InstanceId:",v.(map[string]interface{})["InstanceId"])
+		// 使用 strings.Contains 检查字符串是否包含子字符串
+		if strings.Contains(v.(map[string]interface{})["InstanceName"].(string), "ecs-verify") {
+			find_ecs = true
+			now := time.Now()
+			oneHourLater := now.Add(time.Minute * 58)
+			//oneHourLater = oneHourLater.Add(-time.Hour * 8)
+			AutoReleaseTime := oneHourLater.Format(time.RFC3339)
+			fmt.Println("延期：", v.(map[string]interface{})["InstanceName"].(string),v.(map[string]interface{})["InstanceId"].(string),AutoReleaseTime)
+
+			ModifyInstanceAutoReleaseTime(v.(map[string]interface{})["InstanceId"].(string),AutoReleaseTime)
+		}
+	}
+
+
+	// 判断是否要创建
+	if !find_ecs {
+		err := RunInstances()
+		if err != nil {
+			panic(any(err))
+		}
+	}
+
+
+	return _err
+}
+
+/*
+{
+  "body": {
+    "Instances": {
+      "Instance": [{
+        "AdditionalInfo": {},
+        "AutoReleaseTime": "",
+        "ClusterId": "",
+        "Cpu": 2,
+        "CpuOptions": {
+          "CoreCount": 1,
+          "Numa": "ON",
+          "ThreadsPerCore": 2
+        },
+        "CreationTime": "2024-11-23T03:56Z",
+        "CreditSpecification": "",
+        "DedicatedHostAttribute": {
+          "DedicatedHostClusterId": "",
+          "DedicatedHostId": "",
+          "DedicatedHostName": ""
+        },
+        "DedicatedInstanceAttribute": {
+          "Affinity": "",
+          "Tenancy": ""
+        },
+        "DeletionProtection": false,
+        "DeploymentSetId": "",
+        "Description": "",
+        "DeviceAvailable": true,
+        "EcsCapacityReservationAttr": {
+          "CapacityReservationId": "",
+          "CapacityReservationPreference": ""
+        },
+        "EipAddress": {
+          "AllocationId": "",
+          "InternetChargeType": "",
+          "IpAddress": ""
+        },
+        "ExpiredTime": "2025-12-07T16:00Z",
+        "GPUAmount": 0,
+        "GPUSpec": "",
+        "HibernationOptions": {
+          "Configured": false
+        },
+        "HostName": "iZbp1as4p3kp4bip8dgrveZ",
+        "ImageId": "centos_7_9_x64_20G_alibase_20240628.vhd",
+        "ImageOptions": {},
+        "InnerIpAddress": {
+          "IpAddress": []
+        },
+        "InstanceChargeType": "PrePaid",
+        "InstanceId": "i-bp1as4p3kp4bip8dgrve",
+        "InstanceName": "冷链服务器",
+        "InstanceNetworkType": "vpc",
+        "InstanceType": "ecs.u1-c1m2.large",
+        "InstanceTypeFamily": "ecs.u1",
+        "InternetChargeType": "PayByBandwidth",
+        "InternetMaxBandwidthIn": 1000,
+        "InternetMaxBandwidthOut": 5,
+        "IoOptimized": true,
+        "Memory": 4096,
+        "MetadataOptions": {
+          "HttpEndpoint": "",
+          "HttpTokens": ""
+        },
+        "NetworkInterfaces": {
+          "NetworkInterface": [{
+            "MacAddress": "00:16:3e:01:0f:62",
+            "NetworkInterfaceId": "eni-bp156zuduohi3pw9j7th",
+            "PrimaryIpAddress": "172.20.11.83",
+            "PrivateIpSets": {
+              "PrivateIpSet": [{
+                "Primary": true,
+                "PrivateIpAddress": "172.20.11.83"
+              }]
+            },
+            "Type": "Primary"
+          }]
+        },
+        "OSName": "CentOS  7.9 64位",
+        "OSNameEn": "CentOS  7.9 64 bit",
+        "OSType": "linux",
+        "OperationLocks": {
+          "LockReason": []
+        },
+        "PrivateDnsNameOptions": {},
+        "PublicIpAddress": {
+          "IpAddress": ["47.97.103.163"]
+        },
+        "Recyclable": false,
+        "RegionId": "cn-hangzhou",
+        "ResourceGroupId": "",
+        "SaleCycle": "",
+        "SecurityGroupIds": {
+          "SecurityGroupId": ["sg-bp156zuduohi3pw66zbm"]
+        },
+        "SerialNumber": "7c66d46a-ddef-451d-b542-c518b819d54e",
+        "SpotPriceLimit": 0.0,
+        "SpotStrategy": "NoSpot",
+        "StartTime": "2024-12-22T11:47Z",
+        "Status": "Running",
+        "StoppedMode": "Not-applicable",
+        "VlanId": "",
+        "VpcAttributes": {
+          "NatIpAddress": "",
+          "PrivateIpAddress": {
+            "IpAddress": ["172.20.11.83"]
+          },
+          "VSwitchId": "vsw-bp11bjxe8djsv3c254bur",
+          "VpcId": "vpc-bp14wz0vpzqhssnuezw1j"
+        },
+        "ZoneId": "cn-hangzhou-h"
+      }]
+    },
+    "NextToken": "",
+    "PageNumber": 1,
+    "PageSize": 10,
+    "RequestId": "A3F8B366-6F44-59BD-AE01-805090689456",
+    "TotalCount": 1
+  },
+  "headers": {
+    "access-control-allow-origin": "*",
+    "access-control-expose-headers": "*",
+    "connection": "keep-alive",
+    "content-type": "application/json;charset=utf-8",
+    "date": "Thu, 20 Feb 2025 01:04:22 GMT",
+    "keep-alive": "timeout=25",
+    "vary": "Accept-Encoding",
+    "x-acs-request-id": "A3F8B366-6F44-59BD-AE01-805090689456",
+    "x-acs-trace-id": "c3aef4e6346f739c859a7d7a93723893"
+  },
+  "statusCode": 200
+}
+
+*/

lib/albb/RunInstances.go

@@ -0,0 +1,70 @@
+// This file is auto-generated, don't edit it. Thanks.
+package albb
+
+import (
+	"encoding/json"
+	"fmt"
+	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
+	openapiutil "github.com/alibabacloud-go/openapi-util/service"
+	util "github.com/alibabacloud-go/tea-utils/v2/service"
+	"github.com/alibabacloud-go/tea/tea"
+	"time"
+)
+
+
+func RunInstances () (_err error) {
+	fmt.Println("RunInstances New")
+	client, _err := CreateClient()
+	if _err != nil {
+		return _err
+	}
+
+	params := &openapi.Params{
+		// 接口名称
+		Action: tea.String("RunInstances"),
+		// 接口版本
+		Version: tea.String("2014-05-26"),
+		// 接口协议
+		Protocol: tea.String("HTTPS"),
+		// 接口 HTTP 方法
+		Method: tea.String("POST"),
+		AuthType: tea.String("AK"),
+		Style: tea.String("RPC"),
+		// 接口 PATH
+		Pathname: tea.String("/"),
+		// 接口请求体内容格式
+		ReqBodyType: tea.String("json"),
+		// 接口响应体内容格式
+		BodyType: tea.String("json"),
+	}
+	// query params
+	queries := map[string]interface{}{}
+	queries["RegionId"] = tea.String("cn-hangzhou")
+	// 获取当前时间
+	now := time.Now()
+	// 向后推移一个小时
+	oneHourLater := now.Add(time.Minute * 58)
+	//oneHourLater = oneHourLater.Add(-time.Hour * 8)
+	println("AutoReleaseTime:",oneHourLater.Format("2006-01-02T15:04:05Z"))
+	//queries["AutoReleaseTime"] = tea.String("2025-02-19T21:05:00Z")
+	queries["AutoReleaseTime"] = tea.String(oneHourLater.Format(time.RFC3339) )
+	//queries["LaunchTemplateId"] = tea.String("lt-bp17ecmtdol5eq0skeff")
+	queries["LaunchTemplateName"] = tea.String("ecs-verify")
+	queries["LaunchTemplateVersion"] = tea.Int(1)
+	// runtime options
+	runtime := &util.RuntimeOptions{}
+	request := &openapi.OpenApiRequest{
+		Query: openapiutil.Query(queries),
+	}
+
+	// 复制代码运行请自行打印 API 的返回值
+	// 返回值实际为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。
+	_result, _err := client.CallApi(params, request, runtime)
+	if _err != nil {
+		return _err
+	}
+	data, _ := json.Marshal(_result)
+	fmt.Println(string(data))
+	return _err
+}
+

lib/albb/inte.go

@@ -0,0 +1,26 @@
+package albb
+
+import (
+	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
+	"github.com/alibabacloud-go/tea/tea"
+)
+
+var _result_sdk = &openapi.Client{}
+var _result_is bool
+func CreateClient () (_result_sdk *openapi.Client,_err  error) {
+	if _result_is {
+		return _result_sdk, _err
+	}
+	// The project code leakage may result in the leakage of AccessKey, posing a threat to the security of all resources under the account. The following code examples are for reference only.
+	// It is recommended to use the more secure STS credential. For more credentials, please refer to: https://www.alibabacloud.com/help/en/alibaba-cloud-sdk-262060/latest/configure-credentials-378661.
+	config := &openapi.Config{
+		// Required, please ensure that the environment variables ALIBABA_CLOUD_ACCESS_KEY_ID is set.
+		AccessKeyId: tea.String("LTAI5tFYbEUnUBH3sh7wV8Fj"),
+		// Required, please ensure that the environment variables ALIBABA_CLOUD_ACCESS_KEY_SECRET is set.
+		AccessKeySecret: tea.String("D2LXL9oMNKUtpp2xqoH1CVIrEHy2vi"),
+	}
+	// See https://api.alibabacloud.com/product/Ecs.
+	config.Endpoint = tea.String("ecs.cn-hangzhou.aliyuncs.com")
+	_result_sdk, _err = openapi.NewClient(config)
+	return _result_sdk, _err
+}

lib/lib.go

@@ -453,3 +453,20 @@ func ConvertMinutesToDHM(minutes int) string {
 
 	return fmt.Sprintf("%dd%dh%dm", days, hours, remainingMinutes)
 }
+//  判断是否是本月的
+func IsInCurrentMonth(dateStr string) (bool, error) {
+	// 定义时间格式
+	layout := "2006-01-02 15:04:05"
+
+	// 解析字符串时间
+	parsedTime, err := time.Parse(layout, dateStr)
+	if err != nil {
+		return false, err
+	}
+
+	// 获取当前时间
+	now := time.Now()
+
+	// 判断年份和月份是否相同
+	return parsedTime.Year() == now.Year() && parsedTime.Month() == now.Month(), nil
+}

lib/wx/qywx.go

@@ -0,0 +1,151 @@
+package wx
+
+import (
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/Account"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
+)
+
+var Qytoken string
+func init() {
+	go func() {
+		gettoken()
+		time.Sleep(time.Hour * 24)
+	}()
+}
+
+func gettoken() {
+
+	url := "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=ww0befb06f19910467&corpsecret=83STGNLwghXsjYRacRhUHPL-fkkO1jwsMgabjXcRLyg"
+	method := "GET"
+
+	client := &http.Client {
+	}
+	req, err := http.NewRequest(method, url, nil)
+
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	res, err := client.Do(req)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer res.Body.Close()
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	fmt.Println(string(body))
+
+	// Product _
+	type Product struct {
+		Access_token      string  `json:"access_token"`
+		Errcode    int     `json:"errcode"`
+	}
+
+	p := &Product{}
+	err = json.Unmarshal(body, p)
+	if err != nil {
+		time.Sleep(time.Second * 1)
+		gettoken()
+	}
+	if p.Errcode != 0 {
+		time.Sleep(time.Second * 1)
+		gettoken()
+	}
+
+	Qytoken = p.Access_token
+
+}
+// Message represents the JSON structure
+type Message struct {
+	Touser           string `json:"touser"`
+	Toparty          string `json:"toparty"`
+	Totag            string `json:"totag"`
+	Msgtype          string `json:"msgtype"`
+	Agentid          int    `json:"agentid"`
+	Text             Text    `json:"text"`
+	Safe             int    `json:"safe"`
+	EnableIDTrans    int    `json:"enable_id_trans"`
+	EnableDuplicateCheck int `json:"enable_duplicate_check"`
+}
+
+// Text represents the text component of the message
+type Text struct {
+	Content string `json:"content"`
+}
+// @all  LiKeHui|xxxx
+func WxSend(User,Content string) {
+	if len(User) == 0 {
+		logs.Println("Error User 为空")
+		return
+	}
+	User = Account.AdminWXListToMap(Account.Read_Admin_List_ALL_1())[User]
+	if len(User) == 0 {
+		logs.Println("Error User 为空")
+		return
+	}
+	url := "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token="+Qytoken
+	method := "POST"
+
+	// Example of creating and marshaling the struct to JSON
+	message := Message{
+		Touser:           User,
+		Toparty:          "@all",
+		Totag:            "@all",
+		Msgtype:          "text",
+		Agentid:          1000008,
+		Text:             Text{Content: Content},
+		Safe:             0,
+		EnableIDTrans:    0,
+		EnableDuplicateCheck: 0,
+	}
+
+	jsonData, err := json.Marshal(message)
+	if err != nil {
+		logs.Println("Error marshalling to JSON:", err)
+		return
+	}
+	logs.Println(string(jsonData))
+	payload := strings.NewReader(string(jsonData))
+
+	client := &http.Client {
+	}
+	req, err := http.NewRequest(method, url, payload)
+
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	req.Header.Add("Content-Type", "application/json")
+
+	res, err := client.Do(req)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer res.Body.Close()
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	logs.Println("WxSend:",string(body))
+	if strings.Contains(string(body),"access_token expired"){
+		gettoken()
+		time.Sleep(time.Second * 1)
+		WxSend(User,Content)
+	}
+
+}

models/Account/Admin.go

@@ -15,6 +15,7 @@ type Admin struct {
 	T_name  string `orm:"size(256);null"`      // 姓名
 	T_user  string `orm:"size(256);null"`      // 用户名
 	T_pass  string `orm:"size(256);null"`      // 密码
+	T_wxname  string `orm:"size(256);null"`      // 微信name
 
 	T_State    int       `orm:"size(200);default(1)"`                                  //  0删除  1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
@@ -27,6 +28,7 @@ type Admin_R struct {
 	T_power_name string `orm:"column(t_power_name)"` // 权限
 	T_name       string `orm:"column(t_name)"`       // 姓名
 	T_user       string `orm:"column(t_user)"`       // 用户名
+	T_wxname       string `orm:"column(t_user)"`       // 用户名
 }
 
 func (t *Admin) TableName() string {
@@ -43,6 +45,7 @@ func AdminToAdmin_R(T Admin, powerMap map[int]string) (T_r Admin_R) {
 	T_r.T_power = T.T_power
 	T_r.T_name = T.T_name
 	T_r.T_user = T.T_user
+	T_r.T_wxname = T.T_wxname
 	T_r.T_power_name = powerMap[T.T_power]
 	return T_r
 }
@@ -192,6 +195,14 @@ func AdminListToMap(A []Admin) map[string]string {
 	return maps
 }
 
+func AdminWXListToMap(A []Admin) map[string]string {
+	maps := make(map[string]string, len(A))
+	for _, v := range A {
+		maps[v.T_uuid] = v.T_wxname
+	}
+	return maps
+}
+
 type AdminPower_R struct {
 	T_uuid       string `orm:"column(t_uuid)"`
 	T_name       string `orm:"column(t_name)"`       // 姓名
@@ -209,3 +220,15 @@ func AdminToAdminPower_R(T Admin, PowerMaps map[int]string) (T_r AdminPower_R) {
 	T_r.T_power_name = T_power_name
 	return T_r
 }
+
+// 获取全部列表
+func Read_Admin_List_ALL_T_power(T_power int)  []Admin {
+
+	o := orm.NewOrm()
+	var r []Admin
+	qs := o.QueryTable(new(Admin))
+
+	qs.Filter("T_power", T_power).Filter("T_State", 1).OrderBy("Id").All(&r)
+
+	return r
+}

models/Certificate/Certificate.go

@@ -165,7 +165,7 @@ func Read_Certificate_List(T_Certificate_sn, T_layout_no, Time_start, Time_end s
 	}
 
 	// 获取总条数
-	sql := "SELECT COUNT(ID) FROM certificate AS c LEFT JOIN (SELECT t_release_time,t_failure_time,t_pdf,t__certificate_sn,t_layout_no FROM (SELECT DISTINCT * FROM `certificate_pdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t_layout_no) AS pdf ON pdf.t_layout_no=c.t_layout_no WHERE t__state=1"
+	sql := "SELECT COUNT(c.ID)   FROM certificate AS c   LEFT JOIN (      SELECT           t_layout_no,          MAX(t_release_time) AS max_release_time,          MAX(t_failure_time) AS max_failure_time,          GROUP_CONCAT(t_pdf) AS pdf_list,        MAX(t__certificate_sn) AS latest_certificate_sn     FROM           (SELECT DISTINCT * FROM certificate_pdf WHERE t__state=1 ORDER BY id DESC) f       GROUP BY           t_layout_no  ) AS pdf ON pdf.t_layout_no = c.t_layout_no   WHERE c.t__state = 1;"
 	sql = sql + sqlWhere
 	logs.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
@@ -176,7 +176,7 @@ func Read_Certificate_List(T_Certificate_sn, T_layout_no, Time_start, Time_end s
 		return maps, 0
 	}
 	//sql = "SELECT * FROM Certificate AS c LEFT JOIN (SELECT any_value(t_release_time) t_release_time,any_value(t_failure_time) t_failure_time,any_value(t_pdf) t_pdf,t__certificate_sn FROM (SELECT DISTINCT * FROM `CertificatePdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t__certificate_sn) AS pdf ON pdf.t__certificate_sn=c.t_sn WHERE t__state=1"
-	sql = "SELECT *,c.t_layout_no as t_layout_no FROM certificate AS c LEFT JOIN (SELECT t_release_time,t_failure_time,t_pdf,t__certificate_sn,t_layout_no FROM (SELECT DISTINCT * FROM `certificate_pdf` WHERE t__state=1 ORDER BY id DESC) f GROUP BY t_layout_no) AS pdf ON pdf.t_layout_no=c.t_layout_no WHERE t__state=1"
+	sql = "WITH RankedCertificates AS (      SELECT           *,          ROW_NUMBER() OVER (PARTITION BY t_layout_no ORDER BY id DESC) AS rn      FROM           certificate_pdf      WHERE           t__state = 1  )  SELECT       c.*,       pdf.t_layout_no AS t_layout_no,      pdf.t_release_time,      pdf.t_failure_time,      pdf.t_pdf,      pdf.t__certificate_sn  FROM       certificate AS c   LEFT JOIN RankedCertificates AS pdf ON pdf.t_layout_no = c.t_layout_no AND pdf.rn = 1  WHERE       c.t__state = 1"
 
 	sql = sql + sqlWhere
 	sqlOrder := make([]string, 0)

models/System/News.go

@@ -61,6 +61,7 @@ func Add_News(T_uuid, T_Title, T_Url string) {
 
 // 发送微信通知
 func Send_Weichat_News(T_admin_name, T_Title, T_Url string) {
+	// 微信通知
 	client := resty.New()
 	client.R().
 		SetFormData(map[string]string{
@@ -69,6 +70,9 @@ func Send_Weichat_News(T_admin_name, T_Title, T_Url string) {
 		}).
 		Post(conf.WechatNews_Url)
 
+
+
+
 }
 
 // 获取列表

models/Task/Task.go

@@ -12,6 +12,7 @@ import (
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
+	"strings"
 	"time"
 )
 
@@ -26,9 +27,9 @@ var (
 		TaskSchemeStateWaitSubmit:   "待提交",
 		TaskSchemeStateSubmitted:    "已提交",
 		TaskSchemeStateClientPass:   "已通过(客户)",
-		TaskSchemeStateClientReturn: "已退回(客户)",
-		TaskSchemeStatePass:         "已通过(负责人)",
-		TaskSchemeStateReturn:       "已退回(负责人)",
+		TaskSchemeStateClientReturn: "已驳回(客户)",
+		TaskSchemeStatePass:         "已通过",
+		TaskSchemeStateReturn:       "已退回",
 	}
 
 	// 0 未完成 1 数据来源已完成 2 处理中 3 已采集-无数据 4-数据编辑已完成(已提交) 5已通过(报告负责人) 6已退回(报告负责人)
@@ -45,23 +46,23 @@ var (
 		TaskCollectionStateInProgress: "处理中",
 		TaskCollectionStateNoData:     "已采集-无数据",
 		TaskCollectionStateSubmitted:  "数据编辑已完成",
-		TaskCollectionStatePass:       "已通过(负责人)",
-		TaskCollectionStateReturn:     "已退回(负责人)",
+		TaskCollectionStatePass:       "已通过",
+		TaskCollectionStateReturn:     "已退回",
 	}
 
 	TaskReportingStateWaitSubmit   = 0 // 待提交
 	TaskReportingStateSubmitted    = 5 // 已提交
 	TaskReportingStateClientPass   = 1 // 已通过(客户)
 	TaskReportingStateClientReturn = 2 // 已退回(客户)
-	TaskReportingStatePass         = 3 // 已通过(负责人)
-	TaskReportingStateReturn       = 4 // 已退回(负责人)
+	TaskReportingStatePass         = 3 // 已通过
+	TaskReportingStateReturn       = 4 // 已退回
 	TaskReportingStateMap          = map[int]string{
 		TaskReportingStateWaitSubmit:   "待提交",
 		TaskReportingStateSubmitted:    "已提交",
 		TaskReportingStateClientPass:   "已通过(客户)",
-		TaskReportingStateClientReturn: "已退回(客户)",
-		TaskReportingStatePass:         "已通过(负责人)",
-		TaskReportingStateReturn:       "已退回(负责人)",
+		TaskReportingStateClientReturn: "已驳回(客户)",
+		TaskReportingStatePass:         "已通过",
+		TaskReportingStateReturn:       "已退回",
 	}
 
 	TaskDeliveryStateUnfinished = 0 // 未完成
@@ -83,21 +84,38 @@ var (
 
 var (
 	TaskSchemeTimeLimit = map[string]float64{
-		"LC":  60, // LC-冷藏车
-		"XT":  30, // XT-系统
-		"WZ":  80, // WZ-位置
-		"LK":  60, // LK-冷库
-		"LG":  30, // LG-冷柜
-		"BWX": 30, // BWX-保温箱
+		"BWX": 30, // 保温箱
+		"LDX": 30, // 冷冻箱
+		"LCG": 30, // 冷藏柜
+		"LDG": 30, // 冷冻柜
+		"YLG": 30, // 阴凉柜
+		"LDC": 60, // 冷藏车
+		"LK":  60, // 冷库
+		"BG":  60, // 冰柜
+		"DWBWX":  60, // 低温保存箱
+		"XT":  30, // 系统验证
+		"WZ":  80, // 位置
+		"XJ":  0, // 巡检
+		"PX":  0, // 培训
+		"QT":  0, // 其他
 	}
 
 	TaskReportingTimeLimit = map[string]float64{
-		"LC":  300, // LC-冷藏车
-		"XT":  300, // XT-系统
-		"WZ":  240, // WZ-位置
-		"LK":  360, // LK-冷库
-		"LG":  180, // LG-冷柜
-		"BWX": 180, // BWX-保温箱
+		"BWX": 180, // 保温箱
+		"LDX": 180, // 冷冻箱
+		"LCG": 210, // 冷藏柜
+		"LDG": 210, // 冷冻柜
+		"YLG": 210, // 阴凉柜
+		"LDC": 300, // 冷藏车
+		"LK":  390, // 冷库
+		"BG":  210, // 冰柜
+		"DWBWX":  180, // 低温保存箱
+		"XT":  300, // 系统验证
+		"WZ":  240, // 位置
+		"XJ":  0, // 巡检
+		"PX":  0, // 培训
+		"QT":  0, // 其他
+
 	}
 
 	TaskCollectionTimeLimit float64 = 7 * 24 * 60
@@ -136,6 +154,7 @@ type Task struct {
 	T_reporting_state      int    `orm:"size(2);default(0)"` // 报告编写 状态 0 未完成 1 已完成(客户通过) 2已退回(客户) 3已通过(负责人) 4已退回(负责人) 5已提交
 	T_delivery_state       int    `orm:"size(2);default(0)"` // 交付审核 状态 0 未完成 1 已完成 2 处理中
 	T_marking_state        int    `orm:"size(2);default(0)"` // 验证标识 状态 0 未完成 1 已完成
+	T_record string  `orm:"type(text)"`     // 领导备注
 
 	T_VerifyDeviceDataStartTime string `orm:"size(256);null"` // 验证设备数据开始时间
 	T_VerifyDeviceDataEndTime   string `orm:"size(256);null"` // 验证设备数据开始时间
@@ -211,6 +230,7 @@ type Task struct {
 	T_reporting_return_times  int     `orm:"size(256);null"`  // 验证报告退回次数
 	T_reporting_audit_record  string  `orm:"type(text);null"` // 验证报告审核记录
 
+
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
@@ -269,6 +289,7 @@ type Task_ struct {
 	T_district_code string                        // 区 code
 	T_area_code     []string                      // 省市区
 	InfoCollection  InfoCollection.InfoCollection //信息采集
+	T_record  string //
 
 }
 
@@ -371,6 +392,8 @@ type Task_Stat struct {
 	T_reporting_audit_record  string                          // 验证报告审核记录
 	InfoCollection            InfoCollection.InfoCollection_R //信息菜鸡
 
+	T_record  string                          //
+
 }
 
 func (t *Task) TableName() string {
@@ -452,6 +475,7 @@ func TaskToTask_(T Task, userMap, adminMap map[string]string) (T_ Task_) {
 
 	T_.T_sn = T.T_sn
 	T_.T_CalibrationExpirationTime = T.T_CalibrationExpirationTime
+	T_.T_record = T.T_record
 
 	return T_
 }
@@ -541,8 +565,8 @@ func TaskToTask_Stat(T Task, userMap, adminMap map[string]string) (T_ Task_Stat)
 	T_.T_scheme_start_time = T.T_scheme_start_time
 	T_.T_scheme_end_time = T.T_scheme_end_time
 
-	if T.T_scheme_state == TaskSchemeStateClientPass ||
-		T.T_scheme_state == TaskSchemeStateClientReturn ||
+	if T.T_scheme_state == TaskSchemeStateSubmitted ||
+		T.T_scheme_state == TaskSchemeStateClientPass ||
 		T.T_scheme_state == TaskSchemeStatePass {
 		T_.T_scheme_time_interval = lib.ConvertMinutesToDHM(int(T.T_scheme_time_interval))
 		T_.T_scheme_overtime = lib.ConvertMinutesToDHM(int(T.T_scheme_overtime))
@@ -556,7 +580,8 @@ func TaskToTask_Stat(T Task, userMap, adminMap map[string]string) (T_ Task_Stat)
 	T_.T_enter_area_time = T.T_enter_area_time
 	T_.T_collection_start_time = T.T_collection_start_time
 	T_.T_collection_end_time = T.T_collection_end_time
-	if T.T_collection_state == TaskCollectionStatePass {
+	if T.T_collection_state == TaskCollectionStatePass ||
+		T.T_collection_state == TaskCollectionStateSubmitted{
 		T_.T_collection_time_interval = lib.ConvertMinutesToDHM(int(T.T_collection_time_interval))
 		T_.T_collection_overtime = lib.ConvertMinutesToDHM(int(T.T_collection_overtime))
 	}
@@ -569,6 +594,7 @@ func TaskToTask_Stat(T Task, userMap, adminMap map[string]string) (T_ Task_Stat)
 	T_.T_reporting_end_time = T.T_reporting_end_time
 
 	if T.T_reporting_state == TaskReportingStateClientPass ||
+		T.T_reporting_state == TaskReportingStateSubmitted ||
 		T.T_reporting_state == TaskReportingStateClientReturn ||
 		T.T_reporting_state == TaskReportingStatePass {
 		T_.T_reporting_time_interval = lib.ConvertMinutesToDHM(int(T.T_reporting_time_interval))
@@ -578,6 +604,7 @@ func TaskToTask_Stat(T Task, userMap, adminMap map[string]string) (T_ Task_Stat)
 	T_.T_reporting_signature = T.T_reporting_signature
 	T_.T_reporting_return_times = T.T_reporting_return_times
 	T_.T_reporting_audit_record = T.T_reporting_audit_record
+	T_.T_record = T.T_record
 
 	return T_
 }
@@ -739,7 +766,23 @@ func Add_Task_Visit(m Task) bool {
 	}
 	return false
 }
+// 获取用户任务列表
+func Read_Task_List_All() ([]Task, int) {
+
+	o := orm.NewOrm()
 
+	qs := o.QueryTable(new(Task))
+	var r []Task
+
+	cond := orm.NewCondition()
+	//cond1 := cond.And("T_name__icontains", T_name).And("T_State", 1)
+	cond1 := cond.And("T_State", 1)
+
+	qs.Limit(10, 0).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
+
+	return r, int(cnt)
+}
 // 获取用户任务列表
 func Read_UserTask_List(T_uuid string, T_name string, userMap, adminMap map[string]string, page int, page_z int) ([]Task_, int) {
 
@@ -775,7 +818,7 @@ func Read_UserTask_List(T_uuid string, T_name string, userMap, adminMap map[stri
 // 获取任务列表
 func Read_Task_List(T_uuid, T_admin, T_name, T_InfoCollection_id string, T_scheme, T_collection, T_reporting, T_delivery,
 	T_scheme_state, T_collection_state, T_reporting_state, T_delivery_state, T_marking_state string,
-	T_company_list []string, userMap, adminMap map[string]string, page int, page_z int) ([]Task_, int) {
+	T_company_list []string, userMap, adminMap map[string]string,CreateTime string, page int, page_z int) ([]Task_, int) {
 
 	o := orm.NewOrm()
 
@@ -831,6 +874,18 @@ func Read_Task_List(T_uuid, T_admin, T_name, T_InfoCollection_id string, T_schem
 	if len(T_marking_state) > 0 {
 		cond1 = cond1.And("T_marking_state", T_marking_state)
 	}
+	if len(CreateTime) > 0 {
+		CreateTime_s := strings.Split(CreateTime,"-")
+
+		if len(CreateTime_s) == 2{
+			// 定义开始和结束时间
+			start := time.Date(lib.To_int(CreateTime_s[0]), time.Month(lib.To_int(CreateTime_s[1])), 1, 0, 0, 0, 0, time.UTC)
+			end := start.AddDate(0, 1, 0) // 下个月的第一天
+			logs.Println("CreateTime_s:",start.Format("2006-01-02 15:04:05"),end.Format("2006-01-02 15:04:05"))
+			cond1 = cond1.And("CreateTime__gte", start).And("CreateTime__lt", end)
+		}
+
+	}
 
 	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
 	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
@@ -935,7 +990,7 @@ func Get_Task_UserList(T_type string) []string {
 
 func Read_Task_Stat(T_uuid, T_admin, T_name, T_InfoCollection_id string, T_project, T_scheme, T_collection, T_reporting, T_delivery,
 	T_scheme_state, T_collection_state, T_reporting_state, T_delivery_state, T_marking_state string,
-	T_company_list []string, userMap, adminMap map[string]string, page int, page_z int) ([]Task_Stat, int) {
+	T_company_list []string, userMap, adminMap map[string]string,CreateTime string, page int, page_z int) ([]Task_Stat, int) {
 
 	o := orm.NewOrm()
 
@@ -994,7 +1049,18 @@ func Read_Task_Stat(T_uuid, T_admin, T_name, T_InfoCollection_id string, T_proje
 	if len(T_marking_state) > 0 {
 		cond1 = cond1.And("T_marking_state", T_marking_state)
 	}
+	if len(CreateTime) > 0 {
+		CreateTime_s := strings.Split(CreateTime,"-")
 
+		if len(CreateTime_s) == 2{
+			// 定义开始和结束时间
+			start := time.Date(lib.To_int(CreateTime_s[0]), time.Month(lib.To_int(CreateTime_s[1])), 1, 0, 0, 0, 0, time.UTC)
+			end := start.AddDate(0, 1, 0) // 下个月的第一天
+			logs.Println("CreateTime_s:",start.Format("2006-01-02 15:04:05"),end.Format("2006-01-02 15:04:05"))
+			cond1 = cond1.And("CreateTime__gte", start).And("CreateTime__lt", end)
+		}
+
+	}
 	if page_z == 9999 {
 		qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&r)
 	} else {
@@ -1010,3 +1076,25 @@ func Read_Task_Stat(T_uuid, T_admin, T_name, T_InfoCollection_id string, T_proje
 
 	return TaskList, int(cnt)
 }
+
+
+// 获取用户任务列表
+func Read_UserTask_StatisticalRanking(T_uuid,T_scheme string) []Task {
+
+	o := orm.NewOrm()
+
+	qs := o.QueryTable(new(Task))
+	var r []Task
+
+	cond := orm.NewCondition()
+	//cond_T_uuid := orm.NewCondition().Or("T_scheme", T_uuid).Or("T_collection", T_uuid).Or("T_reporting", T_uuid)
+	//cond1 := cond.And("T_name__icontains", T_name).And("T_State", 1)
+	cond1 := cond.And("T_State", 1).And(T_scheme,T_uuid)
+
+
+	qs.Limit(500, 0).SetCond((*orm2.Condition)(cond1)).OrderBy("-UpdateTime").All(&r)
+	qs.SetCond((*orm2.Condition)(cond1)).Count()
+
+
+	return r
+}

models/Task/TaskTime.go

@@ -0,0 +1,187 @@
+package Task
+
+import (
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/Account"
+	"github.com/beego/beego/v2/adapter/orm"
+	orm2 "github.com/beego/beego/v2/client/orm"
+	_ "github.com/go-sql-driver/mysql"
+	"time"
+)
+
+// 模板
+type TaskTime struct {
+	Id int `orm:"column(ID);size(11);auto;pk"`
+
+	T_task_id    string `orm:"size(256);"`     // 任务ID
+	T_task_type  int    `orm:"size(256);"`     // 任务类型 方案0 实施1 报告2
+	T_uuid       string `orm:"size(256);null"` // 用户 UUID
+	T_start_time string `orm:"size(256);null"` // 开始时间
+	T_end_time   string `orm:"size(256);null"` // 结束时间
+	T_remarks    string `orm:"type(text)"`     // 备注
+
+	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
+	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
+}
+
+func (t *TaskTime) TableName() string {
+	return "tasktime" // 数据库名称   // ************** 替换 FormulaList **************
+}
+
+func init() {
+	//注册模型
+	orm.RegisterModel(new(TaskTime))
+}
+
+// -------------------------------------------------------------
+type TaskTime_R struct {
+	Id           int
+	T_task_id    string // 任务ID
+	T_task_type  int    // 任务类型 方案0 实施1 报告2
+	T_uuid       string // 用户 UUID
+	T_uuid_name       string // 用户 UUID
+	T_start_time string // 开始时间
+	T_end_time   string // 结束时间
+	T_remarks    string // 验证方案客户签字确认图片
+
+}
+
+// -------------------------------------------------------------
+func TaskTimeToTaskTime_R(T TaskTime) (T_r TaskTime_R) {
+	T_r.Id           = T.Id
+	T_r.T_task_id    = T.T_task_id
+	T_r.T_task_type  = T.T_task_type
+	T_r.T_uuid       = T.T_uuid
+	if err, r := Account.Read_Admin_ByT_uuid(T.T_uuid); err == nil {
+		T_r.T_uuid_name = r.T_name
+	}
+	T_r.T_start_time = T.T_start_time
+	T_r.T_end_time   = T.T_end_time
+	T_r.T_remarks    = T.T_remarks
+	return T_r
+}
+
+// ---------------- 特殊方法 -------------------
+
+// 获取 ById
+func Read_TaskTime_ById(id int) (r TaskTime, is bool) {
+	o := orm.NewOrm()
+	r = TaskTime{Id: id}
+	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return r, false
+	}
+	return r, true
+}
+
+// 获取 By
+func Read_TaskTime(T_TaskTime_id string) (r TaskTime, is bool) {
+
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(TaskTime))
+	err := qs.Filter("T_TaskTime_id", T_TaskTime_id).One(&r)
+	if err != nil {
+		return r, false
+	}
+
+	return r, true
+}
+
+func Read_TaskTime_T_name(T_name string) (r TaskTime, is bool) {
+
+	o := orm.NewOrm()
+	qs := o.QueryTable(new(TaskTime))
+	err := qs.Filter("T_name", T_name).One(&r)
+	if err != nil {
+		return r, false
+	}
+
+	return r, true
+}
+
+// 添加
+func Add_TaskTime(r TaskTime) (is bool) {
+	o := orm.NewOrm()
+
+	_, err := o.Insert(&r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return false
+	}
+
+	return true
+}
+
+// 删除
+func Delete_TaskTime(v TaskTime) bool {
+	o := orm.NewOrm()
+	if num, err := o.Delete(&v); err == nil {
+		logs.Println("Number of records deleted in database:", num)
+	} else {
+		return false
+	}
+
+	return true
+}
+
+// 修改
+func Update_TaskTime(m TaskTime, cols ...string) bool {
+	o := orm.NewOrm()
+	if num, err := o.Update(&m, cols...); err == nil {
+		logs.Println("Number of records updated in database:", num)
+		return true
+	}
+	return false
+}
+
+// 获取列表
+func Read_TaskTime_List(T_task_id string, T_task_type int) ([]TaskTime_R, int64) {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+	var r []TaskTime
+	qs := o.QueryTable(new(TaskTime))
+
+	cond := orm.NewCondition()
+	cond1 := cond.And("T_task_id", T_task_id).And("T_task_type", T_task_type)
+
+	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("Id").All(&r)
+	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
+	// 转换
+	var TaskTime_r []TaskTime_R
+	for _, v := range r {
+		TaskTime_r = append(TaskTime_r, TaskTimeToTaskTime_R(v))
+	}
+
+	return TaskTime_r, cnt
+}
+// 获取项目延时
+func Read_TaskTime_Compute(T_task_id string, T_task_type int) (int64) {
+	List, _ := Read_TaskTime_List(T_task_id , T_task_type )
+	var time_interval_Compute float64
+	for _,v := range List{
+		if len(v.T_end_time) == 0{
+			continue;
+		}
+
+		_,err:=time.ParseInLocation("2006-01-02 15:04:05",v.T_end_time, time.Local)
+		if err != nil {
+			continue;
+		}
+		_,err=time.ParseInLocation("2006-01-02 15:04:05",v.T_start_time, time.Local)
+		if err != nil {
+			continue;
+		}
+		time_interval, err := lib.MinutesDifference(v.T_start_time, v.T_end_time)
+		if err != nil {
+			continue;
+		}
+
+		time_interval_Compute += time_interval
+	}
+
+	logs.Println("Read_TaskTime_Compute",T_task_id,T_task_type,time_interval_Compute)
+	return int64(time_interval_Compute)
+}

models/VerifyTemplate/VerifyTemplate.go

@@ -24,6 +24,8 @@ type VerifyTemplate struct {
 	T_inspect   string `orm:"size(256);null"` // 自检
 	T_cover     string `orm:"size(256);null"` // 封面
 
+	T_deploy  string   `orm:"type(text);null"` // 部点选项  格式 布点内容1|布点内容2|布点内容3
+
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now 每次 model 保存时都会对时间自动更新
 }
@@ -38,7 +40,7 @@ type VerifyTemplate_R struct {
 	T_inspect   string // 自检
 	T_marking   string // 标识模板
 	T_cover     string // 封面
-
+	T_deploy  string  // 部点选项  格式 布点内容1|布点内容2|布点内容3
 }
 
 func (t *VerifyTemplate) TableName() string {
@@ -62,6 +64,7 @@ func VerifyTemplateToVerifyTemplate_R(T VerifyTemplate) (T_r VerifyTemplate_R) {
 	T_r.T_inspect = T.T_inspect
 	T_r.T_marking = T.T_marking
 	T_r.T_cover = T.T_cover
+	T_r.T_deploy = T.T_deploy
 
 	return T_r
 }

models/VerifyTemplate/VerifyTemplateMap.go

@@ -30,6 +30,8 @@ type VerifyTemplateMap struct {
 	T_name string `orm:"size(256);null"`     // 标签名称
 	T_text string `orm:"size(256);null"`     // 描述
 	T_sort int    `orm:"size(2);default(1)"` // 排序
+	T_Required int    `orm:"size(2);default(0)"` // 必填项  1 必填   0 非必填
+	T_Construction int    `orm:"size(2);default(0)"` // 实施（是否在APP 上显示）  1 显示   0 不显示
 
 	// 验证流程
 	T_flow_sort int `orm:"size(2);default(0)"` // 验证流程排序
@@ -47,6 +49,8 @@ type VerifyTemplateMap_R struct {
 	T_name       string // 标签名称
 	T_text       string // 描述
 	T_sort       int    // 排序
+	T_Required       int    // 必填项  1 必填   0 非必填
+	T_Construction       int   // 实施（是否在APP 上显示）  1 显示   0 不显示
 	T_flow_sort  int    // 验证流程排序
 	T_max_time   int    // 验证流程最大时间
 	T_min_time   int    // 验证流程最小时间
@@ -72,6 +76,8 @@ func VerifyTemplateMapToVerifyTemplateMap_R(T VerifyTemplateMap) (T_r VerifyTemp
 	T_r.T_name = T.T_name
 	T_r.T_text = T.T_text
 	T_r.T_sort = T.T_sort
+	T_r.T_Required = T.T_Required
+	T_r.T_Construction = T.T_Construction
 	T_r.T_flow_sort = T.T_flow_sort
 	T_r.T_max_time = T.T_max_time
 	T_r.T_min_time = T.T_min_time

models/VerifyTemplate/VerifyTemplateMapData.go

@@ -17,6 +17,8 @@ type VerifyTemplateMapData struct {
 	T_VerifyTemplate_id    string `orm:"index,size(256);null"` // 模板id
 	T_VerifyTemplateMap_id string `orm:"index,size(256);null"` // 标签id
 	T_value                string `orm:"size(1024);null"`      // 内容
+	T_Required             int    `orm:"size(2);default(0)"`   // 必填项  1 必填   0 非必填
+	T_Construction         int    `orm:"size(2);default(0)"`   // 实施（是否在APP 上显示）  1 显示   0 不显示
 
 	// 验证流程
 	T_flow_sort int `orm:"size(2);default(0)"` // 验证流程排序
@@ -37,6 +39,8 @@ type VerifyTemplateMapData_R struct {
 	T_name                 string // 标题
 	T_text                 string // 标题
 	T_value                string //
+	T_Required             int    //
+	T_Construction         int    //
 	// 验证流程
 	T_flow_sort int // 验证流程排序
 	T_max_time  int // 验证流程最大时间
@@ -62,6 +66,8 @@ func VerifyTemplateMapToVerifyTemplateMapData_R(T VerifyTemplateMap) (T_r Verify
 	T_r.T_label = T.T_label
 	T_r.T_name = T.T_name
 	T_r.T_text = T.T_text
+	T_r.T_Required = T.T_Required
+	T_r.T_Construction = T.T_Construction
 
 	T_r.T_flow_sort = T.T_flow_sort
 	T_r.T_max_time = T.T_max_time
@@ -77,6 +83,8 @@ func VerifyTemplateMapDataToVerifyTemplateMapData_R(T VerifyTemplateMap, VerifyT
 	T_r.T_label = T.T_label
 	T_r.T_name = T.T_name
 	T_r.T_text = T.T_text
+	T_r.T_Required = T.T_Required
+	T_r.T_Construction = T.T_Construction
 
 	T_r.T_flow_sort = T.T_flow_sort
 	T_r.T_max_time = T.T_max_time
@@ -145,7 +153,9 @@ func AddOrUpdate_VerifyTemplateMapData_ADD_History(List []VerifyTemplateMapData,
 			T_VerifyTemplate_id:    v.T_VerifyTemplate_id,
 			T_VerifyTemplateMap_id: v.T_VerifyTemplateMap_id,
 			T_value:                v.T_value,
+			T_Required:             v.T_Required,
 			T_flow_sort:            v.T_flow_sort,
+			T_Construction:         v.T_Construction,
 			T_max_time:             v.T_max_time,
 			T_min_time:             v.T_min_time,
 		})

models/VerifyTemplate/VerifyTemplateMapDataHistory.go

@@ -17,6 +17,8 @@ type VerifyTemplateMapDataHistory struct {
 	T_VerifyTemplate_id    string `orm:"size(256);null"`       // 模板id
 	T_VerifyTemplateMap_id string `orm:"size(256);null"`       // 标签id
 	T_value                string `orm:"type(text);null"`      // 内容
+	T_Required             int    `orm:"size(2);default(0)"`   // 必填项  1 必填   0 非必填
+	T_Construction         int    `orm:"size(2);default(0)"`   // 实施（是否在APP 上显示）  1 显示   0 不显示
 
 	T_uuid          string `orm:"index,size(256);null"` // 提交人
 	T_time          string `orm:"index,size(256);null"` // 提交时间
@@ -38,6 +40,8 @@ type VerifyTemplateMapDataHistory_R struct {
 	T_name                 string // 标题
 	T_text                 string // 标题
 	T_value                string //
+	T_Required             int    //
+	T_Construction         int    //
 	// 验证流程
 	T_flow_sort int // 验证流程排序
 	T_max_time  int // 验证流程最大时间
@@ -61,6 +65,8 @@ func VerifyTemplateMapToVerifyTemplateMapDataHistory_R(T VerifyTemplateMap) (T_r
 	T_r.T_label = T.T_label
 	T_r.T_name = T.T_name
 	T_r.T_text = T.T_text
+	T_r.T_Required = T.T_Required
+	T_r.T_Construction = T.T_Construction
 
 	T_r.T_flow_sort = T.T_flow_sort
 	T_r.T_max_time = T.T_max_time
@@ -76,6 +82,8 @@ func VerifyTemplateMapDataToVerifyTemplateMapDataHistory_R(T VerifyTemplateMap,
 	T_r.T_label = T.T_label
 	T_r.T_name = T.T_name
 	T_r.T_text = T.T_text
+	T_r.T_Required = T.T_Required
+	T_r.T_Construction = T.T_Construction
 
 	T_r.T_flow_sort = T.T_flow_sort
 	T_r.T_max_time = T.T_max_time
@@ -170,7 +178,8 @@ func Read_VerifyTemplateMapDataHistory_History_List(T_task_id string, T_source i
 	o := orm.NewOrm()
 
 	var pl_lists []VerifyTemplateMapDataHistory_History_List_Res
-	_, err := o.Raw("SELECT DISTINCT t_uuid,t_time FROM verify_template_map_data_history where t_task_id = ? and t_submit_source = ? order by t_time desc LIMIT 0,1000 ", T_task_id, T_source).
+	//_, err := o.Raw("SELECT DISTINCT t_uuid,t_time FROM verify_template_map_data_history where t_task_id = ? and t_submit_source = ? order by t_time desc LIMIT 0,1000 ", T_task_id, T_source).
+	_, err := o.Raw("SELECT DISTINCT t_uuid,t_time FROM verify_template_map_data_history where t_task_id = ? order by t_time desc LIMIT 0,1000 ", T_task_id, T_source).
 		QueryRows(&pl_lists)
 	if err != nil {
 		logs.Error(lib.FuncName(), err)

routers/InfoCollection.go

@@ -16,6 +16,7 @@ func init() {
 	beego.Router("/InfoCollection/AuditRecordList", &controllers.InfoCollectionController{}, "*:AuditRecordList") // 信息采集审核记录
 	beego.Router("/InfoCollection/Statistics", &controllers.InfoCollectionController{}, "*:Statistics")      // 小程序统计
 
+
 	beego.Router("/InfoTemplate/Class_List", &controllers.InfoTemplateController{}, "*:Class_List") // 分类列表
 	beego.Router("/InfoTemplate/Class_Add", &controllers.InfoTemplateController{}, "*:Class_Add")   // 分类添加
 	beego.Router("/InfoTemplate/Class_Up", &controllers.InfoTemplateController{}, "*:Class_Up")     // 分类修改

routers/Task.go

@@ -27,13 +27,14 @@ func init() {
 	beego.Router("/Task/GetTaskUserList", &controllers.TaskController{}, "*:GetTaskUserList")             // 获取任务负责人列表
 	beego.Router("/Task/Stat", &controllers.TaskController{}, "*:Stat")                                   // 报告统计
 	beego.Router("/Task/Stat_Excel", &controllers.TaskController{}, "*:Stat_Excel")                       // 报告统计-excel
+	beego.Router("/Task/StatisticalRanking", &controllers.TaskController{}, "*:StatisticalRanking")       // 报告统计-excel
 
 	// 日志
 	beego.Router("/TaskLogs/List", &controllers.TaskController{}, "*:Logs_List")
 
 	// 提取数据
 	beego.Router("/TaskData/Extract_TaskData", &controllers.TaskDataController{}, "*:Extract_TaskData_Back")
-	//beego.Router("/TaskData/Extract_TaskData_Back", &controllers.TaskDataController{}, "*:Extract_TaskData_Back")
+	beego.Router("/TaskData/Up_TaskData", &controllers.TaskDataController{}, "*:TaskData_Up_TaskData_Back")
 	beego.Router("/TaskData/TaskDataClass_List", &controllers.TaskDataController{}, "*:TaskDataClass_List") // 任务数据分类列表
 	beego.Router("/TaskData/List", &controllers.TaskDataController{}, "*:TaskData_List")                    // 任务数据列表
 	beego.Router("/TaskData/Add", &controllers.TaskDataController{}, "*:TaskData_Add")                      // 添加任务数据
@@ -60,4 +61,8 @@ func init() {
 	beego.Router("/Task/jpg", &controllers.TaskController{}, "*:DeviceData_JPG")            // 任务生成图片
 	beego.Router("/Task/JPG/State", &controllers.TaskController{}, "*:DeviceData_JPGState") // 任务 图片生成状态
 
+	// 暂停申请
+	beego.Router("/TaskTime/Get", &controllers.TaskController{}, "*:TaskTimeList") // 任务列表
+	beego.Router("/TaskTime/Add", &controllers.TaskController{}, "*:TaskTimeAdd")  // 添加任务
+	beego.Router("/TaskTime/End", &controllers.TaskController{}, "*:TaskTimeEnd")  // 编辑任务
 }

routers/router.go

@@ -16,6 +16,7 @@ func init() {
 	beego.Router("/VerifyTemplate/Add", &controllers.VerifyTemplateController{}, "*:Add")   // 模板添加
 	beego.Router("/VerifyTemplate/Up", &controllers.VerifyTemplateController{}, "*:Up")     // 模板编辑
 	beego.Router("/VerifyTemplate/Del", &controllers.VerifyTemplateController{}, "*:Del")   // 模板修改
+	beego.Router("/VerifyTemplate/Get", &controllers.VerifyTemplateController{}, "*:Get")   // 模板修改
 	beego.Router("/VerifyTemplate/Copy", &controllers.VerifyTemplateController{}, "*:Copy") // 模板复制
 
 	beego.Router("/VerifyTemplate/Map_List", &controllers.VerifyTemplateController{}, "*:Map_List") // 标签列表

tests/default_test.go

@@ -1,54 +1,42 @@
 package test
 
 import (
-	"ColdVerify_server/lib"
-	"ColdVerify_server/logs"
+	"ColdVerify_server/lib/albb"
 	"fmt"
 	"os/exec"
+	"strings"
 	"testing"
-	"time"
 )
 
 func TestBeego(t *testing.T) {
-	formatTimeStr := "2022-05-25 18:58"
-	formatTime, err := time.Parse("2006-01-02 15:04", formatTimeStr)
-	if err != nil {
-		logs.Error(lib.FuncName(), err)
+	data := "001,69000000001|002,69000000002|001,69000000001|003,69000000003|"
+
+	// 根据 | 分割数据
+	items := strings.Split(data, "|")
+
+	// 创建一个 map 来去重
+	uniqueItems := make(map[string]struct{})
+
+	for _, item := range items {
+		// 如果不为空，则添加到 map 中
+		if item != "" {
+			uniqueItems[item] = struct{}{}
+		}
 	}
-	logs.Println("formatTime", formatTime) //打印结果：2017-04-11 13:33:37 +0000 UTC
-	//// Read from docx file
-	//r, err := docx.ReadDocxFile("./template.docx")
-	//// Or read from memory
-	//// r, err := docx.ReadDocxFromMemory(data io.ReaderAt, size int64)
-	//
-	//// Or read from a filesystem object:
-	//// r, err := docx.ReadDocxFromFS(file string, fs fs.FS)
-	//
-	//if err != nil {
-	//	panic(err)
-	//}
-	//docx1 := r.Editable()
-	//// Replace like https://golang.org/pkg/strings/#Replace
-	//docx1.Replace("old_1_1", "new_1_1", -1)
-	//docx1.Replace("old_1_2", "new_1_2", -1)
-	////docx1.ReplaceLink("http://example.com/", "https://github.com/nguyenthenguyen/docx", 1)
-	////docx1.ReplaceHeader("out with the old", "in with the new")
-	////docx1.ReplaceFooter("Change This Footer", "new footer")
-	//docx1.WriteToFile("./new_result_1.docx")
-	//
-	//docx2 := r.Editable()
-	//docx2.Replace("old_2_1", "new_2_1", -1)
-	//docx2.Replace("old_2_2", "new_2_2", -1)
-	//docx2.WriteToFile("./new_result_2.docx")
 
-	//// Or write to ioWriter
-	//// docx2.Write(ioWriter io.Writer)
+	// 将唯一项拼接成字符串
+	result := ""
 
-	//docx3 := r.Editable()
+	for item := range uniqueItems {
+		result += item + "|"
+	}
 
-	////Currently only swaps apples for apples i.e. png to png, and not png to jpeg etc.
-	////d.ReplaceImage("word/media/image1.png", "./new.png")
-	//docx3.WriteToFile("./new_result_3.docx")
+	// 移除最后的 | 字符
+	if len(result) > 0 {
+		result = result[:len(result)-1]
+	}
+
+	fmt.Println(result)
 
 }
 
@@ -72,3 +60,7 @@ func TestR(t *testing.T) {
 	// 打印Python脚本的输出
 	fmt.Println(string(output))
 }
+
+func TestDescribeInstances(t *testing.T) {
+	albb.DescribeInstances()
+}