add：增加经销商绑定验证模板

controllers/DeviceClass.go

@@ -685,6 +685,49 @@ func (c *DeviceClassController) List_Up() {
 	return
 }
 
+// 修改终端
+func (c *DeviceClassController) List_Up_terminal() {
+	// 验证登录 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
+	}
+
+	T_terminal, _ := c.GetInt("T_terminal")
+	T_task_id := c.GetString("T_task_id")
+	T_id := c.GetString("T_id")
+
+	task, is := Task.Read_Task(T_task_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取任务失败!"}
+		c.ServeJSON()
+		return
+	}
+
+	r, is := Device.Read_DeviceClassList_T_class_T_id(task.T_class, T_id)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取设备失败!"}
+		c.ServeJSON()
+		return
+	}
+	
+	if T_terminal > 0 {
+		r.T_terminal = T_terminal
+	}
+
+	if !Device.Update_DeviceClassList(r, "T_terminal") {
+		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 *DeviceClassController) List_Del() {
 	// 验证登录 User_is, User_r

controllers/Distributor.go

@@ -235,6 +235,8 @@ func (c *DistributorController) BindVerifyTemplate() {
 	c.ServeJSON()
 	return
 }
+
+// 绑定模版分类
 func (c *DistributorController) ReadVerifyTemplateClass() {
 	// 验证登录 User_is, User_r
 	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
@@ -293,3 +295,16 @@ func (c *DistributorController) ReadVerifyTemplate() {
 	c.ServeJSON()
 	return
 }
+
+func (c *DistributorController) VerifyTemplateClass_List() {
+	// 验证登录 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
+	}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplateClass_List_For_Distributor()}
+	c.ServeJSON()
+	return
+}

controllers/VerifyTemplate.go

@@ -5,6 +5,7 @@ import (
 	"ColdVerify_server/lib"
 	"ColdVerify_server/logs"
 	"ColdVerify_server/models/Account"
+	"ColdVerify_server/models/Distributor"
 	"ColdVerify_server/models/System"
 	"ColdVerify_server/models/Task"
 	"ColdVerify_server/models/VerifyTemplate"
@@ -83,21 +84,20 @@ func (c *VerifyTemplateController) List() {
 	T_name := c.GetString("T_name")
 
 	logs.Debug("经销商id", User_r.T_Distributor_id)
-	// Fixme 经销商只能获取绑定的验证模版 绑定功能做好之后再打开此注释
-	//if len(User_r.T_Distributor_id) > 0 {
-	//	var cnt int64
-	//	List, cnt := Distributor.Read_DistributorVerifyTemplate_List(User_r.T_Distributor_id, T_class, T_name, 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
-	//}
+	if len(User_r.T_Distributor_id) > 0 {
+		var cnt int64
+		List, cnt := Distributor.Read_DistributorVerifyTemplate_List(User_r.T_Distributor_id, T_class, T_name, 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
+	}
 
 	var cnt int64
 	List, cnt := VerifyTemplate.Read_VerifyTemplate_List(T_class, T_name, page, page_z)
@@ -1087,12 +1087,11 @@ func (c *VerifyTemplateController) Class_List() {
 		return
 	}
 	logs.Debug("经销商id", User_r.T_Distributor_id)
-	// Fixme 经销商只能获取绑定的验证模版分类 绑定功能做好之后再打开此注释
-	//if len(User_r.T_Distributor_id) > 0 {
-	//	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Distributor.Read_DistributorVerifyTemplateClass_List(User_r.T_Distributor_id)}
-	//	c.ServeJSON()
-	//	return
-	//}
+	if len(User_r.T_Distributor_id) > 0 {
+		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Distributor.Read_DistributorVerifyTemplateClass_List(User_r.T_Distributor_id)}
+		c.ServeJSON()
+		return
+	}
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplateClass_List()}
 	c.ServeJSON()

models/Device/DeviceClassList.go

@@ -20,13 +20,14 @@ import (
 type DeviceClassList struct {
 	Id int `orm:"column(ID);size(11);auto;pk"`
 
-	T_class          int    `orm:"size(200);null"`  // 分类
-	T_id             string `orm:"size(20);null"`   // 设备id
-	T_sn             string `orm:"size(256);null"`  // 设备序列号 KF开头，环境监测主机。 YD开头，温途监测主机
-	T_failure_time   string `orm:"size(256);null"`  // 失效时间
-	T_pdf            string `orm:"size(256);null"`  // pdf链接
-	T_Certificate_sn string `orm:"size(256);null"`  // 证书编号
-	T_remark         string `orm:"size(1024);null"` // 备注
+	T_class          int    `orm:"size(200);null"`     // 分类
+	T_id             string `orm:"size(20);null"`      // 设备id
+	T_sn             string `orm:"size(256);null"`     // 设备序列号 KF开头，环境监测主机。 YD开头，温途监测主机
+	T_terminal       int    `orm:"size(2);default(1)"` // 1-验证工具 2-终端
+	T_failure_time   string `orm:"size(256);null"`     // 失效时间
+	T_pdf            string `orm:"size(256);null"`     // pdf链接
+	T_Certificate_sn string `orm:"size(256);null"`     // 证书编号
+	T_remark         string `orm:"size(1024);null"`    // 备注
 
 	T_State    int       `orm:"size(2);default(1)"`                                    // 0 删除   1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now_add 第一次保存时才设置时间

models/Distributor/Distributor.go

@@ -26,6 +26,7 @@ type Distributor struct {
 type Distributor_R struct {
 	T_name           string
 	T_Distributor_id string
+	T_VerifyTemplate []string
 }
 
 func (t *Distributor) TableName() string {
@@ -54,6 +55,7 @@ func init() {
 func DistributorToDistributor_R(T Distributor) (T_r Distributor_R) {
 	T_r.T_name = T.T_name
 	T_r.T_Distributor_id = T.T_Distributor_id
+	T_r.T_VerifyTemplate = Read_DistributorVerifyTemplate(T.T_Distributor_id)
 
 	//......
 	return T_r

models/Distributor/DistributorVerifyTemplate.go

@@ -56,6 +56,16 @@ func Delete_DistributorVerifyTemplate(T_Distributor_id string) bool {
 
 	return true
 }
+func Read_DistributorVerifyTemplate(T_Distributor_id string) (list []string) {
+	o := orm.NewOrm()
+	var map_r []DistributorVerifyTemplate
+	qs := o.QueryTable(new(DistributorVerifyTemplate))
+	qs.Filter("T_Distributor_id", T_Distributor_id).All(&map_r)
+	for _, v := range map_r {
+		list = append(list, v.T_VerifyTemplate_id)
+	}
+	return
+}
 
 // 获取列表
 func Read_DistributorVerifyTemplateClass_List(T_Distributor_id string) (r []VerifyTemplate.VerifyTemplateClass) {

models/VerifyTemplate/VerifyTemplateClass.go

@@ -42,6 +42,16 @@ type VerifyTemplateClass_R struct {
 	Children []VerifyTemplateClass `orm:"-"`
 }
 
+type VerifyTemplateClass_Distributor struct {
+	Id                  int
+	T_fid               int    // 项目 id， VerifyTemplateClass.ID
+	T_name              string // 名称
+	T_State             int    // 0 删除（伪删除）   1 正常（已交付）     2 开发中
+	T_path              string
+	T_VerifyTemplate_id string
+	Children            []VerifyTemplateClass_Distributor `orm:"-"`
+}
+
 // 获取 ById
 func Read_VerifyTemplateClass_ById(id int) (r VerifyTemplateClass, err error) {
 	o := orm.NewOrm()
@@ -301,3 +311,70 @@ func CopyVerifyTemplateClassTree(T_path string, parentId int, T_name string) (ne
 
 	return newRoot, nil
 }
+
+// 获取列表
+func Read_VerifyTemplateClass_List_For_Distributor() (r []VerifyTemplateClass_Distributor) {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+	var map_r []VerifyTemplateClass
+	qs := o.QueryTable(new(VerifyTemplateClass))
+
+	cond := orm.NewCondition()
+
+	cond1 := cond.And("T_State", 1)
+
+	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-Id").All(&map_r)
+
+	// 转换
+	for _, v := range map_r {
+		r = append(r, VerifyTemplateClass_Distributor{
+			Id:                  v.Id,
+			T_name:              v.T_name,
+			T_fid:               v.T_fid,
+			T_path:              v.T_path,
+			T_VerifyTemplate_id: strconv.Itoa(v.Id),
+		})
+	}
+
+	r = VerifyTemplateClass_Call_For_Distributor(r, 0)
+
+	return r
+
+}
+
+func VerifyTemplateClass_Call_For_Distributor(list []VerifyTemplateClass_Distributor, parentId int) []VerifyTemplateClass_Distributor {
+	res := make([]VerifyTemplateClass_Distributor, 0)
+	for _, v := range list {
+		if v.T_fid == parentId {
+			v.Children = VerifyTemplateClass_Call_For_Distributor(list, v.Id)
+			verifyTemplate_List := Read_VerifyTemplate_List_For_Distributor(v.Id)
+			v.Children = append(v.Children, verifyTemplate_List...)
+			res = append(res, v)
+		}
+	}
+	return res
+}
+
+func Read_VerifyTemplate_List_For_Distributor(T_class int) []VerifyTemplateClass_Distributor {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+	var r []VerifyTemplate
+	qs := o.QueryTable(new(VerifyTemplate))
+
+	cond := orm.NewCondition()
+	cond1 := cond.And("T_class", T_class)
+
+	qs.SetCond((*orm2.Condition)(cond1)).OrderBy("T_name").All(&r)
+	// 转换
+	var VerifyTemplate_r []VerifyTemplateClass_Distributor
+	for _, v := range r {
+		VerifyTemplate_r = append(VerifyTemplate_r, VerifyTemplateClass_Distributor{
+			T_name:              v.T_name,
+			T_VerifyTemplate_id: v.T_VerifyTemplate_id,
+		})
+	}
+
+	return VerifyTemplate_r
+}

routers/Device.go

@@ -18,6 +18,7 @@ func init() {
 	beego.Router("/DeviceClassList/List", &controllers.DeviceClassController{}, "*:List_List")                                        // 设备分类列表
 	beego.Router("/DeviceClassList/Add", &controllers.DeviceClassController{}, "*:List_Add")                                          // 添加设备分类列表
 	beego.Router("/DeviceClassList/Up", &controllers.DeviceClassController{}, "*:List_Up")                                            // 编辑设备分类列表
+	beego.Router("/DeviceClassList/Up_terminal", &controllers.DeviceClassController{}, "*:List_Up_terminal")                          // 编辑设备分类列表
 	beego.Router("/DeviceClassList/Del", &controllers.DeviceClassController{}, "*:List_Del")                                          // 删除设备分类列表
 	beego.Router("/DeviceClassList/Copy", &controllers.DeviceClassController{}, "*:List_Copy")                                        // 复制
 	beego.Router("/DeviceClassList/Template_Download", &controllers.DeviceClassController{}, "*:List_Template_Download")              // 添加设备列表模版

routers/Distributor.go

@@ -7,12 +7,13 @@ import (
 
 func init() {
 	// 模版路由
-	beego.Router("/Distributor/All", &controllers.DistributorController{}, "*:List_All")                                    // 经销商列表
-	beego.Router("/Distributor/List", &controllers.DistributorController{}, "*:List")                                       // 经销商列表
-	beego.Router("/Distributor/Add", &controllers.DistributorController{}, "*:Add")                                         // 添加经销商
-	beego.Router("/Distributor/Up", &controllers.DistributorController{}, "*:Up")                                           // 编辑经销商
-	beego.Router("/Distributor/Del", &controllers.DistributorController{}, "*:Del")                                         // 删除经销商
-	beego.Router("/Distributor/BindVerifyTemplate", &controllers.DistributorController{}, "*:BindVerifyTemplate")           // 删除经销商
-	beego.Router("/Distributor/ReadVerifyTemplate", &controllers.DistributorController{}, "*:ReadVerifyTemplate")           // 删除经销商
-	beego.Router("/Distributor/ReadVerifyTemplateClass", &controllers.DistributorController{}, "*:ReadVerifyTemplateClass") // 删除经销商
+	beego.Router("/Distributor/All", &controllers.DistributorController{}, "*:List_All")                                      // 经销商列表
+	beego.Router("/Distributor/List", &controllers.DistributorController{}, "*:List")                                         // 经销商列表
+	beego.Router("/Distributor/Add", &controllers.DistributorController{}, "*:Add")                                           // 添加经销商
+	beego.Router("/Distributor/Up", &controllers.DistributorController{}, "*:Up")                                             // 编辑经销商
+	beego.Router("/Distributor/Del", &controllers.DistributorController{}, "*:Del")                                           // 删除经销商
+	beego.Router("/Distributor/BindVerifyTemplate", &controllers.DistributorController{}, "*:BindVerifyTemplate")             // 删除经销商
+	beego.Router("/Distributor/ReadVerifyTemplate", &controllers.DistributorController{}, "*:ReadVerifyTemplate")             // 删除经销商
+	beego.Router("/Distributor/ReadVerifyTemplateClass", &controllers.DistributorController{}, "*:ReadVerifyTemplateClass")   // 删除经销商
+	beego.Router("/Distributor/VerifyTemplateClass_List", &controllers.DistributorController{}, "*:VerifyTemplateClass_List") // 删除经销商
 }