update：删除时间流程接口，将验证流程集成到验证模板

controllers/DeviceClass.go

@@ -280,12 +280,18 @@ func (c *DeviceClassController) List_Add() {
 		return
 	}
 
-	if _, is := Device.Read_Device(T_sn); !is {
+	if _, is = Device.Read_Device(T_sn); !is {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn 不存在!"}
 		c.ServeJSON()
 		return
 	}
 
+	if dc, is := Device.Read_DeviceClassList_T_class_T_sn(T_class, T_sn); is && dc.Id > 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复添加"}
+		c.ServeJSON()
+		return
+	}
+
 	var_ := Device.DeviceClassList{
 		T_class: T_class,
 		T_id:    T_id,

controllers/VerifyTemplate.go

@@ -174,11 +174,13 @@ func (c *VerifyTemplateController) Map_List() {
 	if page_z < 1 {
 		page_z = conf.Page_size
 	}
+	T_sort, _ := c.GetInt("T_sort")           // 排序
+	T_flow_sort, _ := c.GetInt("T_flow_sort") // 验证流程排序
 
 	T_VerifyTemplate_id := c.GetString("T_VerifyTemplate_id")
 
 	var cnt int64
-	List, cnt := VerifyTemplate.Read_VerifyTemplateMap_List(T_VerifyTemplate_id, page, page_z)
+	List, cnt := VerifyTemplate.Read_VerifyTemplateMap_List(T_VerifyTemplate_id, T_sort, T_flow_sort, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
 	r_jsons.List = List
 	r_jsons.Page = page
@@ -207,6 +209,9 @@ func (c *VerifyTemplateController) Map_Add() {
 	T_label, _ := c.GetInt("T_label")
 	T_source, _ := c.GetInt("T_source")
 	T_sort, _ := c.GetInt("T_sort")
+	T_flow_sort, _ := c.GetInt("T_flow_sort")
+	T_max_time, _ := c.GetInt("T_max_time")
+	T_min_time, _ := c.GetInt("T_min_time")
 
 	var_ := VerifyTemplate.VerifyTemplateMap{
 		T_VerifyTemplate_id: T_VerifyTemplate_id,
@@ -216,6 +221,9 @@ func (c *VerifyTemplateController) Map_Add() {
 		T_label:             T_label,
 		T_source:            T_source,
 		T_sort:              T_sort,
+		T_flow_sort:         T_flow_sort,
+		T_max_time:          T_max_time,
+		T_min_time:          T_min_time,
 	}
 
 	Id, is := VerifyTemplate.Add_VerifyTemplateMap(var_)
@@ -249,6 +257,10 @@ func (c *VerifyTemplateController) Map_Up() {
 	T_sort, T_sort_err := c.GetInt("T_sort")
 	T_source, T_source_err := c.GetInt("T_source")
 
+	T_min_time, T_min_time_err := c.GetInt("T_min_time")
+	T_max_time, T_max_time_err := c.GetInt("T_max_time")
+	T_flow_sort, T_flow_sort_err := c.GetInt("T_flow_sort")
+
 	T_id := c.GetString("T_id")
 
 	r, is := VerifyTemplate.Read_VerifyTemplateMap(T_id)
@@ -278,8 +290,17 @@ func (c *VerifyTemplateController) Map_Up() {
 		r.T_source = T_source
 	}
 
-	// .......
-	if !VerifyTemplate.Update_VerifyTemplateMap(r, "T_name", "T_label", "T_text", "T_field", "T_sort", "T_source") {
+	if T_min_time_err == nil {
+		r.T_min_time = T_min_time
+	}
+	if T_max_time_err == nil {
+		r.T_max_time = T_max_time
+	}
+	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_field", "T_sort", "T_source", "T_min_time", "T_max_time", "T_flow_sort") {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
@@ -414,178 +435,3 @@ func (c *VerifyTemplateController) Map_Data_Pu() {
 	c.ServeJSON()
 	return
 }
-
-/// -----------------------------------------------------------------------------
-
-// 标签列表 -
-func (c *VerifyTemplateController) Time_List() {
-	// 验证登录 User_is, User_r
-	_, User_is := lib.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
-	page, _ := c.GetInt("page")
-	if page < 1 {
-		page = 1
-	}
-	page_z, _ := c.GetInt("page_z")
-	if page_z < 1 {
-		page_z = conf.Page_size
-	}
-
-	T_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
-	r, is := VerifyTemplate.Read_VerifyTemplateMap(T_VerifyTemplateMap_id)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
-		c.ServeJSON()
-		return
-	}
-
-	var cnt int64
-	List, cnt := VerifyTemplate.Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id, r, page, page_z)
-	page_size := math.Ceil(float64(cnt) / float64(page_z))
-	r_jsons.List = List
-	r_jsons.Page = page
-	r_jsons.Page_size = int(page_size)
-	r_jsons.Pages = lib.Func_page(int64(page), int64(page_size))
-	r_jsons.Num = int(cnt)
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
-	c.ServeJSON()
-	return
-}
-
-// 标签添加-
-func (c *VerifyTemplateController) Time_Add() {
-	// 验证登录 User_is, User_r
-	User_r, User_is := lib.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_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
-	T_tag := c.GetString("T_tag")
-	T_step_name := c.GetString("T_step_name")
-	T_min_time, _ := c.GetInt("T_min_time")
-	T_max_time, _ := c.GetInt("T_max_time")
-	T_text := c.GetString("T_text")
-	T_sort, _ := c.GetInt("T_sort")
-
-	var_ := VerifyTemplate.VerifyTemplateTime{
-		T_VerifyTemplateMap_id: T_VerifyTemplateMap_id,
-		T_tag:                  T_tag,
-		T_step_name:            T_step_name,
-		T_min_time:             T_min_time,
-		T_max_time:             T_max_time,
-		T_text:                 T_text,
-		T_sort:                 T_sort,
-	}
-
-	Id, is := VerifyTemplate.Add_VerifyTemplateTime(var_)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
-		c.ServeJSON()
-		return
-	}
-
-	System.Add_UserLogs_T(User_r.T_uuid, "验证模板标签-时间流程", "添加", var_)
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
-	c.ServeJSON()
-	return
-}
-
-// 标签修改-
-func (c *VerifyTemplateController) Time_Up() {
-	// 验证登录 User_is, User_r
-	User_r, User_is := lib.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_VerifyTemplateMap_id := c.GetString("T_VerifyTemplateMap_id")
-	T_tag := c.GetString("T_tag")
-	T_step_name := c.GetString("T_step_name")
-	T_min_time, T_min_time_err := c.GetInt("T_min_time")
-	T_max_time, T_max_time_err := c.GetInt("T_max_time")
-	T_text := c.GetString("T_text")
-	T_sort, T_sort_err := c.GetInt("T_sort")
-
-	T_id := c.GetString("T_id")
-
-	r, is := VerifyTemplate.Read_VerifyTemplateTime(T_id)
-	if !is {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
-		c.ServeJSON()
-		return
-	}
-
-	if len(T_tag) > 0 {
-		r.T_tag = T_tag
-	}
-	if len(T_step_name) > 0 {
-		r.T_step_name = T_step_name
-	}
-	if len(T_text) > 0 {
-		r.T_text = T_text
-	}
-	if T_min_time_err == nil {
-		r.T_min_time = T_min_time
-	}
-	if T_max_time_err == nil {
-		r.T_max_time = T_max_time
-	}
-	if len(T_text) > 0 {
-		r.T_text = T_text
-	}
-	if T_sort_err == nil {
-		r.T_sort = T_sort
-	}
-
-	if !VerifyTemplate.Update_VerifyTemplateTime(r, "T_tag", "T_step_name", "T_min_time", "T_max_time", "T_text", "T_sort") {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
-		c.ServeJSON()
-		return
-	}
-
-	System.Add_UserLogs_T(User_r.T_uuid, "验证模板标签-时间流程", "修改", r)
-
-	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
-	c.ServeJSON()
-	return
-}
-
-// 标签删除-
-func (c *VerifyTemplateController) Time_Del() {
-	// 验证登录 User_is, User_r
-	User_r, User_is := lib.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_id := c.GetString("T_id")
-
-	if r, is := VerifyTemplate.Read_VerifyTemplateTime(T_id); is {
-		if !VerifyTemplate.Delete_VerifyTemplateTime(r) {
-			c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败！"}
-			c.ServeJSON()
-			return
-		}
-		System.Add_UserLogs_T(User_r.T_uuid, "验证模板标签-时间流程", "删除", r)
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!"}
-		c.ServeJSON()
-		return
-	}
-	c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id 错误!"}
-	c.ServeJSON()
-	return
-}

models/Device/DeviceClassList.go

@@ -52,7 +52,7 @@ func init() {
 }
 
 // ---------------- Redis -------------------
-//Redis_Set(m.T_sn,m) // Redis 更新缓存
+// Redis_Set(m.T_sn,m) // Redis 更新缓存
 func Redis_DeviceClassList_Set(key string, r DeviceClassList) (err error) {
 	//json序列化
 	str, err := json.Marshal(r)
@@ -67,9 +67,9 @@ func Redis_DeviceClassList_Set(key string, r DeviceClassList) (err error) {
 	return
 }
 
-//if r,is :=Redis_Get(T_sn);is{
-//return r,nil
-//}
+// if r,is :=Redis_Get(T_sn);is{
+// return r,nil
+// }
 func Redis_DeviceClassList_Get(key string) (r DeviceClassList, is bool) {
 	if redisCache_DeviceClassList.IsExist(key) {
 		logs.Println("找到key:", key)
@@ -117,18 +117,30 @@ func Read_DeviceClassList(T_sn string) (r DeviceClassList, is bool) {
 }
 
 // 添加
-func Add_DeviceClassList(r DeviceClassList) (id int64, is bool) {
+func Read_DeviceClassList_T_class_T_sn(T_class int, T_sn string) (r DeviceClassList, is bool) {
 	o := orm.NewOrm()
-	r.T_State = 1
-	err := o.Read(&r, "T_class", "T_sn", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-	if err == nil {
-		if r.Id > 0 {
-			logs.Println("重复添加", r.T_class, r.T_sn)
-			return 0, false
-		}
+	qs := o.QueryTable(new(DeviceClassList))
+	err := qs.Filter("T_sn", T_sn).Filter("T_class", T_class).Filter("T_State", 1).One(&r)
+	if err != nil {
+		return r, false
 	}
+	return r, true
 
-	id, err = o.Insert(&r)
+}
+
+// 添加
+func Add_DeviceClassList(r DeviceClassList) (id int64, is bool) {
+	o := orm.NewOrm()
+	//r.T_State = 1
+	//err := o.Read(&r, "T_class", "T_sn", "T_State") // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+	//if err == nil {
+	//	if r.Id > 0 {
+	//		logs.Println("重复添加", r.T_class, r.T_sn)
+	//		return 0, false
+	//	}
+	//}
+
+	id, err := o.Insert(&r)
 	if err != nil {
 		logs.Println(err)
 		return 0, false

models/VerifyTemplate/VerifyTemplateMap.go

@@ -32,18 +32,26 @@ type VerifyTemplateMap struct {
 	T_text  string `orm:"size(256);null"`     // 描述
 	T_sort  int    `orm:"size(2);default(1)"` // 排序
 
+	// 验证流程
+	T_flow_sort int `orm:"size(2);default(0)"` // 验证流程排序
+	T_max_time  int `orm:"size(256);"`         // 验证流程最大时间
+	T_min_time  int `orm:"size(256);"`         // 验证流程最小时间
+
 	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 保存时都会对时间自动更新
 }
 
 type VerifyTemplateMap_R struct {
-	T_id     string
-	T_source int    // 数据类型
-	T_label  int    // 来源
-	T_name   string // 标签名称
-	T_field  string // 标签
-	T_text   string // 描述
-	T_sort   int    // 排序
+	T_id        string
+	T_source    int    // 数据类型
+	T_label     int    // 来源
+	T_name      string // 标签名称
+	T_field     string // 标签
+	T_text      string // 描述
+	T_sort      int    // 排序
+	T_flow_sort int    // 验证流程排序
+	T_max_time  int    // 验证流程最大时间
+	T_min_time  int    // 验证流程最小时间
 }
 
 func (t *VerifyTemplateMap) TableName() string {
@@ -66,8 +74,9 @@ func VerifyTemplateMapToVerifyTemplateMap_R(T VerifyTemplateMap) (T_r VerifyTemp
 	T_r.T_field = T.T_field
 	T_r.T_text = T.T_text
 	T_r.T_sort = T.T_sort
-
-	//......
+	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
 	return T_r
 }
 
@@ -145,7 +154,7 @@ func Update_VerifyTemplateMap(m VerifyTemplateMap, cols ...string) bool {
 }
 
 // 获取列表
-func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string, page int, page_z int) ([]VerifyTemplateMap_R, int64) {
+func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string, T_sort, T_flow_sort, page, page_z int) ([]VerifyTemplateMap_R, int64) {
 
 	o := orm.NewOrm()
 	// 也可以直接使用 Model 结构体作为表名
@@ -159,8 +168,16 @@ func Read_VerifyTemplateMap_List(T_VerifyTemplate_id string, page int, page_z in
 	}
 	cond := orm.NewCondition()
 	cond1 := cond.And("T_VerifyTemplate_id", T_VerifyTemplate_id) // .AndNot("status__in", 1).Or("profile__age__gt", 2000)
-
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
+	// 排序 默认升序
+	sort := "T_sort"
+	if T_sort == 1 {
+		sort = "-T_sort"
+	}
+	flow_sort := "T_flow_sort"
+	if T_flow_sort == 1 {
+		flow_sort = "-T_flow_sort"
+	}
+	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy(sort, flow_sort).All(&r)
 	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
 
 	// 转换

models/VerifyTemplate/VerifyTemplateTime.go

@@ -1,165 +0,0 @@
-package VerifyTemplate
-
-import (
-	"ColdVerify_server/lib"
-	"ColdVerify_server/logs"
-	"fmt"
-	"github.com/beego/beego/v2/adapter/orm"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	_ "github.com/go-sql-driver/mysql"
-	"time"
-)
-
-// 模板
-type VerifyTemplateTime struct {
-	Id                     int    `orm:"column(ID);size(11);auto;pk"`
-	T_id                   string `orm:"size(256);null"`
-	T_VerifyTemplateMap_id string `orm:"size(256);null"`     // 标题
-	T_tag                  string `orm:"size(256);null"`     // 对应标签
-	T_step_name            string `orm:"size(256);null"`     // 步骤名称
-	T_min_time             int    `orm:"size(256);"`         // 最小时间
-	T_max_time             int    `orm:"size(256);"`         // 最大时间
-	T_text                 string `orm:"type(text);null"`    // 描述
-	T_sort                 int    `orm:"size(2);default(1)"` // 排序
-
-	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 保存时都会对时间自动更新
-}
-
-type VerifyTemplateTime_R struct {
-	T_id                     string // 标签id
-	T_VerifyTemplateMap_id   string // 标签id
-	T_VerifyTemplateMap_Name string // 标签名称
-	T_tag                    string // 步骤名称
-	T_step_name              string // 步骤名称
-	T_min_time               int    // 最小时间
-	T_max_time               int    // 最大时间
-	T_text                   string // 描述
-	T_sort                   int    // 排序
-
-}
-
-func (t *VerifyTemplateTime) TableName() string {
-	return "verify_template_time" // 数据库名称   // ************** 替换 FormulaList **************
-}
-
-func init() {
-	//注册模型
-	orm.RegisterModel(new(VerifyTemplateTime))
-}
-
-// -------------------------------------------------------------
-func VerifyTemplateTimeToVerifyTemplateTime_R(T VerifyTemplateTime, Map VerifyTemplateMap) (T_r VerifyTemplateTime_R) {
-	T_r.T_id = T.T_id
-	T_r.T_VerifyTemplateMap_id = T.T_VerifyTemplateMap_id
-	T_r.T_VerifyTemplateMap_Name = Map.T_name
-	T_r.T_tag = T.T_tag
-	T_r.T_step_name = T.T_step_name
-	T_r.T_min_time = T.T_min_time
-	T_r.T_max_time = T.T_max_time
-	T_r.T_text = T.T_text
-	T_r.T_sort = T.T_sort
-
-	return T_r
-}
-
-// ---------------- 特殊方法 -------------------
-
-// 获取 ById
-func Read_VerifyTemplateTime_ById(id int) (r VerifyTemplateTime, is bool) {
-	o := orm.NewOrm()
-	r = VerifyTemplateTime{Id: id}
-	err := o.Read(&r) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-	if err != nil {
-		logs.Println(err)
-		return r, false
-	}
-	return r, true
-}
-
-// 获取 By
-func Read_VerifyTemplateTime(T_id string) (r VerifyTemplateTime, is bool) {
-
-	o := orm.NewOrm()
-	qs := o.QueryTable(new(VerifyTemplateTime))
-	err := qs.Filter("T_id", T_id).One(&r)
-	if err != nil {
-		return r, false
-	}
-
-	return r, true
-}
-
-// 添加
-func Add_VerifyTemplateTime(r VerifyTemplateTime) (id int64, is bool) {
-	o := orm.NewOrm()
-
-	// 生成编号
-	rand_x := 0
-	for true {
-		r.T_id = lib.GetRandstring(4, "", int64(rand_x)) // 1,336,336
-		err := o.Read(&r, "T_id")                        // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
-		if err != nil {
-			break
-		}
-		rand_x += 1
-	}
-
-	id, err := o.Insert(&r)
-	if err != nil {
-		logs.Println(err)
-		return 0, false
-	}
-
-	return id, true
-}
-
-// 删除
-func Delete_VerifyTemplateTime(v VerifyTemplateTime) 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_VerifyTemplateTime(m VerifyTemplateTime, cols ...string) bool {
-	o := orm.NewOrm()
-	if num, err := o.Update(&m, cols...); err == nil {
-		fmt.Println("Number of records updated in database:", num)
-		return true
-	}
-	return false
-}
-
-// 获取列表
-func Read_VerifyTemplateTime_List(T_VerifyTemplateMap_id string, Map VerifyTemplateMap, page int, page_z int) ([]VerifyTemplateTime_R, int64) {
-
-	o := orm.NewOrm()
-	// 也可以直接使用 Model 结构体作为表名
-	var r []VerifyTemplateTime
-	qs := o.QueryTable(new(VerifyTemplateTime))
-	var offset int64
-	if page <= 1 {
-		offset = 0
-	} else {
-		offset = int64((page - 1) * page_z)
-	}
-	cond := orm.NewCondition()
-	cond1 := cond.And("T_VerifyTemplateMap_id", T_VerifyTemplateMap_id)
-
-	qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_sort").All(&r)
-	cnt, _ := qs.SetCond((*orm2.Condition)(cond1)).Count()
-
-	// 转换
-	var VerifyTemplateTime_r []VerifyTemplateTime_R
-	for _, v := range r {
-		VerifyTemplateTime_r = append(VerifyTemplateTime_r, VerifyTemplateTimeToVerifyTemplateTime_R(v, Map))
-	}
-
-	return VerifyTemplateTime_r, cnt
-}

routers/router.go

@@ -19,10 +19,4 @@ func init() {
 
 	beego.Router("/VerifyTemplateMapData/List", &controllers.VerifyTemplateController{}, "*:Map_Data_List") // 标签数据列表
 	beego.Router("/VerifyTemplateMapData/Pu", &controllers.VerifyTemplateController{}, "*:Map_Data_Pu")     // 添加标签数据
-
-	beego.Router("/VerifyTemplate/Time_List", &controllers.VerifyTemplateController{}, "*:Time_List") // 时间流程列表
-	beego.Router("/VerifyTemplate/Time_Add", &controllers.VerifyTemplateController{}, "*:Time_Add")   // 时间流程添加
-	beego.Router("/VerifyTemplate/Time_Up", &controllers.VerifyTemplateController{}, "*:Time_Up")     // 时间流程删除
-	beego.Router("/VerifyTemplate/Time_Del", &controllers.VerifyTemplateController{}, "*:Time_Del")   // 时间流程修改
-
 }