ADD：验证模板自检

controllers/Device.go

@@ -195,7 +195,7 @@ func (c *DeviceController) Device_Class() {
 
 	var cnt int64
 	//DeviceList, cnt := Device.Read_DeviceClassList_List(T_class, T_sn, page, 9999)
-	DeviceList, cnt := Device.Read_DeviceClassList_OrderList(T_class, T_sn, page, 9999)
+	DeviceList, cnt := Device.Read_DeviceClassList_OrderList(T_class, T_sn, "", page, 9999)
 
 	for _, v := range DeviceList {
 		Device_r, _ := Device.Read_Device(v.T_sn)

controllers/DeviceClass.go

@@ -216,6 +216,7 @@ func (c *DeviceClassController) List_List() {
 
 	T_class, _ := c.GetInt("T_class")
 	T_sn := c.GetString("T_sn")
+	T_remark := c.GetString("T_remark")
 
 	_, is := Device.Read_DeviceClass_ById(T_class)
 	if !is {
@@ -226,7 +227,7 @@ func (c *DeviceClassController) List_List() {
 
 	var cnt int64
 	//List, cnt := Device.Read_DeviceClassList_List(T_class, T_sn, page, 9999)
-	List, cnt := Device.Read_DeviceClassList_OrderList(T_class, T_sn, page, 9999)
+	List, cnt := Device.Read_DeviceClassList_OrderList(T_class, T_sn, T_remark, page, 9999)
 
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
@@ -509,7 +510,7 @@ func (c *DeviceClassController) List_Copy() {
 		return
 	}
 
-	copyList, cnt := Device.Read_DeviceClassList_OrderList(copy_task.T_class, "", 0, 9999)
+	copyList, cnt := Device.Read_DeviceClassList_OrderList(copy_task.T_class, "", "", 0, 9999)
 	var successNum int // 成功数量
 	errList := []string{}
 	for _, v := range copyList {

controllers/Task.go

@@ -490,7 +490,8 @@ func (c *TaskController) Logs_List() {
 func (c *TaskController) DeviceData_JPGState() {
 
 	T_task_id := c.GetString("T_task_id")
-	jpg, is := Device.Redis_DeviceDataJPG_Get(T_task_id)
+	T_remark := c.GetString("T_remark")
+	jpg, is := Device.Redis_DeviceDataJPG_Get(T_task_id + T_remark)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "暂无图片正在生成"}
 		c.ServeJSON()
@@ -521,6 +522,7 @@ func (c *TaskController) DeviceData_JPG() {
 			return
 		}
 	}
+	T_remark := c.GetString("T_remark")
 
 	TemperatureMin, _ := c.GetFloat("TemperatureMin") // 最低温度
 	TemperatureMax, _ := c.GetFloat("TemperatureMax") // 最高温度
@@ -544,17 +546,17 @@ func (c *TaskController) DeviceData_JPG() {
 		return
 	}
 
-	deviceClassList, _ := Device.Read_DeviceClassList_OrderList(Task_r.T_class, "", 0, 9999)
+	deviceClassList, _ := Device.Read_DeviceClassList_OrderList(Task_r.T_class, "", T_remark, 0, 9999)
 	if !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误!"}
 		c.ServeJSON()
 		return
 	}
 
-	Device.Redis_DeviceDataJPG_Del(T_task_id)
+	Device.Redis_DeviceDataJPG_Del(T_task_id + T_remark)
 
 	// 生成图片
-	go DeviceDataJPG(StartTime, EndTime, T_task_id, deviceClassList, TemperatureMin, TemperatureMax)
+	go DeviceDataJPG(StartTime, EndTime, T_task_id, T_remark, deviceClassList, TemperatureMin, TemperatureMax)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
 	c.ServeJSON()
@@ -562,8 +564,8 @@ func (c *TaskController) DeviceData_JPG() {
 }
 
 // 存档生成图片
-func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.DeviceClassList, TemperatureMin, TemperatureMax float64) {
-	Device.Redis_DeviceDataJPG_Set(T_task_id, Device.DeviceDataJPG{
+func DeviceDataJPG(StartTime, EndTime, T_task_id, T_remark string, deviceList []Device.DeviceClassList, TemperatureMin, TemperatureMax float64) {
+	Device.Redis_DeviceDataJPG_Set(T_task_id+T_remark, Device.DeviceDataJPG{
 		State: 1,
 		Msg:   "图片生成中",
 		Url:   "",
@@ -676,7 +678,7 @@ func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.Dev
 	filename := "jpg" + time.Now().Format("20060102150405")
 	// 保存文件
 	if err := p.Save(10*vg.Inch, 4*vg.Inch, "ofile/"+filename+".jpg"); err != nil {
-		Device.Redis_DeviceDataJPG_Set(T_task_id, Device.DeviceDataJPG{
+		Device.Redis_DeviceDataJPG_Set(T_task_id+T_remark, Device.DeviceDataJPG{
 			State: 3,
 			Msg:   "图片生成失败",
 			Url:   url,
@@ -685,7 +687,7 @@ func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.Dev
 		return
 	}
 	if !lib.Pload_qiniu("ofile/"+filename+".jpg", "ofile/"+filename+".jpg") {
-		Device.Redis_DeviceDataJPG_Set(T_task_id, Device.DeviceDataJPG{
+		Device.Redis_DeviceDataJPG_Set(T_task_id+T_remark, Device.DeviceDataJPG{
 			State: 3,
 			Msg:   "图片上传七牛云失败",
 			Url:   url,
@@ -699,7 +701,7 @@ func DeviceDataJPG(StartTime, EndTime, T_task_id string, deviceList []Device.Dev
 	msg = "图片生成成功"
 	url = "https://bzdcoldverifyoss.baozhida.cn/" + "ofile/" + filename + ".jpg"
 
-	Device.Redis_DeviceDataJPG_Set(T_task_id, Device.DeviceDataJPG{
+	Device.Redis_DeviceDataJPG_Set(T_task_id+T_remark, Device.DeviceDataJPG{
 		State:  state,
 		Msg:    msg,
 		Url:    url,

controllers/VerifyTemplate.go

@@ -110,6 +110,7 @@ func (c *VerifyTemplateController) Up() {
 
 	T_scheme := c.GetString("T_scheme")
 	T_reporting := c.GetString("T_reporting")
+	T_inspect := c.GetString("T_inspect")
 
 	r, is := VerifyTemplate.Read_VerifyTemplate(T_VerifyTemplate_id)
 	if !is {
@@ -129,12 +130,15 @@ func (c *VerifyTemplateController) Up() {
 	if len(T_reporting) > 0 {
 		r.T_reporting = T_reporting
 	}
+	if len(T_inspect) > 0 {
+		r.T_inspect = T_inspect
+	}
 	if T_sort_err == nil {
 		r.T_sort = T_sort
 	}
 
 	// .......
-	if !VerifyTemplate.Update_VerifyTemplate(r, "T_name", "T_sort", "T_scheme", "T_reporting") {
+	if !VerifyTemplate.Update_VerifyTemplate(r, "T_name", "T_sort", "T_scheme", "T_reporting", "T_inspect") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return

models/Device/DeviceClassList.go

@@ -231,7 +231,7 @@ func Read_DeviceClassList_List(T_class int, T_sn string, page int, page_z int) (
 	cnt, _ = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	return r, cnt
 }
-func Read_DeviceClassList_OrderList(T_class int, T_sn string, page int, page_z int) (r []DeviceClassList, cnt int64) {
+func Read_DeviceClassList_OrderList(T_class int, T_sn, T_remark string, page int, page_z int) (r []DeviceClassList, cnt int64) {
 
 	o := orm.NewOrm()
 	var maps_z []orm2.ParamsList
@@ -250,6 +250,9 @@ func Read_DeviceClassList_OrderList(T_class int, T_sn string, page int, page_z i
 	if len(T_sn) > 1 {
 		sqlWhere += " AND t_sn like \"%" + T_sn + "%\""
 	}
+	if len(T_remark) > 0 {
+		sqlWhere += " AND t_remark like \"%" + T_remark + "%\""
+	}
 
 	sql := "SELECT COUNT(ID) FROM device_class_list WHERE " + sqlWhere
 	fmt.Println(sql)

models/VerifyTemplate/VerifyTemplate.go

@@ -21,6 +21,7 @@ type VerifyTemplate struct {
 
 	T_scheme    string `orm:"size(256);null"` // 方案模板
 	T_reporting string `orm:"size(256);null"` // 报告模板
+	T_inspect   string `orm:"size(256);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 保存时都会对时间自动更新
@@ -33,6 +34,7 @@ type VerifyTemplate_R struct {
 
 	T_scheme    string // 方案模板
 	T_reporting string // 报告模板
+	T_inspect   string // 自检
 }
 
 func (t *VerifyTemplate) TableName() string {
@@ -53,6 +55,7 @@ func VerifyTemplateToVerifyTemplate_R(T VerifyTemplate) (T_r VerifyTemplate_R) {
 	T_r.T_sort = T.T_sort
 	T_r.T_scheme = T.T_scheme
 	T_r.T_reporting = T.T_reporting
+	T_r.T_inspect = T.T_inspect
 
 	return T_r
 }

models/VerifyTemplate/VerifyTemplateMapData.go

@@ -111,7 +111,8 @@ func AddOrUpdate_VerifyTemplateMapData(List []VerifyTemplateMapData) (ids []int6
 			}
 		}
 
-		if r.Id > 0 {
+		// 更新验证模版数据
+		if r.Id > 0 && len(r.T_value) > 0 {
 			v.Id = r.Id
 			//_, err = o.Update(&v, "T_flow_sort", "T_max_time", "T_min_time", "T_value")
 			_, err = o.QueryTable(new(VerifyTemplateMapData)).Filter("T_task_id", v.T_task_id).Filter("T_VerifyTemplate_id", v.T_VerifyTemplate_id).