瀏覽代碼

add:经销商绑定模版分类

zoie 2 月之前
父節點
當前提交
fb5dd33d09

+ 102 - 0
controllers/Distributor.go

@@ -6,6 +6,7 @@ import (
 	"ColdVerify_server/models/Account"
 	"ColdVerify_server/models/Distributor"
 	"ColdVerify_server/models/System"
+	"ColdVerify_server/models/VerifyTemplate"
 	beego "github.com/beego/beego/v2/server/web"
 	"math"
 )
@@ -191,3 +192,104 @@ func (c *DistributorController) List_All() {
 	c.ServeJSON()
 	return
 }
+
+// 绑定模板
+func (c *DistributorController) BindVerifyTemplate() {
+	// 验证登录 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_Distributor_id := c.GetString("T_Distributor_id")
+	T_VerifyTemplate_ids := c.GetString("T_VerifyTemplate_ids")
+	idList := lib.SplitStringSeparator(T_VerifyTemplate_ids, "|")
+
+	var list []Distributor.DistributorVerifyTemplate
+	for _, id := range idList {
+		verifyTemplate, is := VerifyTemplate.Read_VerifyTemplate(id)
+		if !is {
+			continue
+		}
+		list = append(list, Distributor.DistributorVerifyTemplate{
+			T_Distributor_id:         T_Distributor_id,
+			T_VerifyTemplate_id:      verifyTemplate.T_VerifyTemplate_id,
+			T_VerifyTemplateClass_id: verifyTemplate.T_class,
+		})
+	}
+	// 删除旧模版
+	Distributor.Delete_DistributorVerifyTemplate(T_Distributor_id)
+
+	// 绑定新模版
+	Id, is := Distributor.Add_DistributorVerifyTemplate(list)
+	if !is {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败!"}
+		c.ServeJSON()
+		return
+	}
+	System.Add_UserLogs_T(User_r.T_uuid, "验证模版", "经销商绑定", list)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Id}
+	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"))
+	if !User_is {
+		c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
+		c.ServeJSON()
+		return
+	}
+	T_Distributor_id := c.GetString("T_Distributor_id")
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: Distributor.Read_DistributorVerifyTemplateClass_List(T_Distributor_id)}
+	c.ServeJSON()
+	return
+}
+
+// 绑定模板
+func (c *DistributorController) ReadVerifyTemplate() {
+	// 验证登录 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_Distributor_id := c.GetString("T_Distributor_id")
+	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_class, _ := c.GetInt("T_class")
+	if T_class <= 0 {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class Err!"}
+		c.ServeJSON()
+		return
+	}
+
+	T_name := c.GetString("T_name")
+
+	var cnt int64
+	List, cnt := Distributor.Read_DistributorVerifyTemplate_List(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
+}

+ 27 - 2
controllers/VerifyTemplate.go

@@ -56,7 +56,7 @@ func (c *VerifyTemplateController) Prepare() {
 // 列表 -
 func (c *VerifyTemplateController) List() {
 	// 验证登录 User_is, User_r
-	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	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()
@@ -82,6 +82,23 @@ 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
+	//}
+
 	var cnt int64
 	List, cnt := VerifyTemplate.Read_VerifyTemplate_List(T_class, T_name, page, page_z)
 	page_size := math.Ceil(float64(cnt) / float64(page_z))
@@ -954,12 +971,20 @@ func (c *VerifyTemplateController) Map_Data_History_Recover() {
 
 func (c *VerifyTemplateController) Class_List() {
 	// 验证登录 User_is, User_r
-	_, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
+	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
 	}
+	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
+	//}
+
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: VerifyTemplate.Read_VerifyTemplateClass_List()}
 	c.ServeJSON()
 	return

+ 1 - 2
models/Distributor/Distributor.go

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-// 模版
+// 分销商
 type Distributor struct {
 	Id               int       `orm:"column(ID);size(11);auto;pk"`
 	T_name           string    `orm:"size(256);null"`                                        // 名称
@@ -21,7 +21,6 @@ type Distributor struct {
 	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 保存时都会对时间自动更新
 	UpdateTime       time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
-
 }
 
 type Distributor_R struct {

+ 169 - 0
models/Distributor/DistributorVerifyTemplate.go

@@ -0,0 +1,169 @@
+package Distributor
+
+import (
+	"ColdVerify_server/lib"
+	"ColdVerify_server/logs"
+	"ColdVerify_server/models/VerifyTemplate"
+	"github.com/beego/beego/v2/adapter/orm"
+	orm2 "github.com/beego/beego/v2/client/orm"
+	_ "github.com/go-sql-driver/mysql"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// 分销商验证模版
+type DistributorVerifyTemplate struct {
+	Id                       int       `orm:"column(ID);size(11);auto;pk"`
+	T_Distributor_id         string    `orm:"size(200);default(1)"`                                  // 分销商 int id
+	T_VerifyTemplate_id      string    `orm:"size(200);default(1)"`                                  // 验证模版 int id
+	T_VerifyTemplateClass_id int       `orm:"size(200);default(1)"`                                  // 验证模版分类 int id
+	CreateTime               time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
+	UpdateTime               time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
+}
+
+func (t *DistributorVerifyTemplate) TableName() string {
+	return "distributor_verify_template" // 数据库名称   // ************** 替换 FormulaList **************
+}
+
+func init() {
+	//注册模型
+	orm.RegisterModel(new(DistributorVerifyTemplate))
+}
+
+// 添加
+func Add_DistributorVerifyTemplate(r []DistributorVerifyTemplate) (id int64, is bool) {
+	o := orm.NewOrm()
+	id, err := o.InsertMulti(len(r), r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return 0, false
+	}
+
+	return id, true
+}
+
+// 删除
+func Delete_DistributorVerifyTemplate(T_Distributor_id string) bool {
+	o := orm.NewOrm()
+
+	qs := o.QueryTable(new(DistributorVerifyTemplate))
+	if num, err := qs.Filter("T_Distributor_id", T_Distributor_id).Delete(); err == nil {
+		logs.Println("Number of records deleted in database:", num)
+	} else {
+		return false
+	}
+
+	return true
+}
+
+// 获取列表
+func Read_DistributorVerifyTemplateClass_List(T_Distributor_id string) (r []VerifyTemplate.VerifyTemplateClass) {
+
+	o := orm.NewOrm()
+	var map_r []VerifyTemplate.VerifyTemplateClass
+	// 也可以直接使用 Model 结构体作为表名
+	sql := "SELECT vtc.* FROM verify_template_class vtc LEFT JOIN distributor_verify_template dvt ON vtc.id = dvt.t__verify_template_class_id" +
+		" WHERE vtc.t__state = 1 and t__distributor_id = '" + T_Distributor_id + "' group by vtc.id order by vtc.id"
+
+	logs.Println(sql)
+
+	_, err := o.Raw(sql).QueryRows(&map_r)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+		return r
+	}
+
+	uniqueMap := make(map[int]struct{})
+	var result []int
+
+	for _, v := range map_r {
+		parents := GetParentIDsByPath(v.T_path)
+		for _, id := range parents {
+			if id == 0 {
+				continue
+			}
+			if _, exists := uniqueMap[id]; !exists {
+				uniqueMap[id] = struct{}{}
+				result = append(result, id)
+			}
+		}
+	}
+	var map_r2 []VerifyTemplate.VerifyTemplateClass
+	qs := o.QueryTable(new(VerifyTemplate.VerifyTemplateClass))
+	qs.Filter("Id__in", result).All(&map_r2)
+
+	r = VerifyTemplate.VerifyTemplateClass_Call(map_r2, 0)
+
+	return r
+
+}
+
+func GetParentIDsByPath(path string) []int {
+	cleaned := strings.Trim(path, "/")
+	if cleaned == "" {
+		return nil
+	}
+	segments := strings.Split(cleaned, "/")
+	parents := make([]int, 0, len(segments))
+	for _, seg := range segments {
+		id, _ := strconv.Atoi(seg)
+		parents = append(parents, id)
+	}
+	return parents
+}
+
+func Read_DistributorVerifyTemplate_List(T_Distributor_id string, T_class int, T_name string, page int, page_z int) ([]VerifyTemplate.VerifyTemplate_R, int64) {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+	var r []VerifyTemplate.VerifyTemplate
+	var VerifyTemplate_r []VerifyTemplate.VerifyTemplate_R
+	var offset int
+	pagez := page_z
+	if page <= 1 {
+		offset = 0
+	} else {
+		offset = (page - 1) * page_z
+	}
+	sqlWhere := "vt.t_class = " + strconv.Itoa(T_class) + " AND t__distributor_id = '" + T_Distributor_id + "'"
+	if len(T_name) > 1 {
+		sqlWhere += " AND vt.t_name like \"%" + T_name + "%\""
+	}
+	sql := "SELECT COUNT(vt.id) FROM verify_template vt LEFT JOIN distributor_verify_template dvt ON vt.t__verify_template_id = dvt.t__verify_template_id COLLATE utf8mb4_general_ci " +
+		"WHERE " + sqlWhere
+	logs.Println(sql)
+	var maps_z []orm2.ParamsList
+	_, err := o.Raw(sql).ValuesList(&maps_z)
+	if err != nil {
+		return VerifyTemplate_r, 0
+	}
+	if len(maps_z) == 0 {
+		return VerifyTemplate_r, 0
+	}
+
+	if page_z != 9999 {
+		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
+	}
+
+	sql = "SELECT vt.* FROM verify_template vt LEFT JOIN distributor_verify_template dvt ON vt.t__verify_template_id = dvt.t__verify_template_id COLLATE utf8mb4_general_ci " +
+		"WHERE " + sqlWhere + " order by vt.t_name"
+	if page_z != 9999 {
+		sql = sql + " LIMIT " + strconv.Itoa(offset) + "," + strconv.Itoa(pagez)
+	}
+
+	logs.Println(sql)
+	_, err = o.Raw(sql).QueryRows(&r)
+	if err != nil {
+		logs.Println(lib.FuncName(), err)
+		return VerifyTemplate_r, 0
+	}
+
+	key, _ := strconv.Atoi(maps_z[0][0].(string))
+
+	for _, v := range r {
+		VerifyTemplate_r = append(VerifyTemplate_r, VerifyTemplate.VerifyTemplateToVerifyTemplate_R(v))
+	}
+
+	return VerifyTemplate_r, int64(key)
+}

+ 8 - 5
routers/Distributor.go

@@ -7,9 +7,12 @@ 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/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") // 删除经销商
 }