接口修改

app/controller/admin/config_dict.go

@@ -5,6 +5,7 @@ import (
 	"gfast/app/model/admin/sys_dict_type"
 	"gfast/app/service/admin/dict_service"
 	"gfast/app/service/admin/user_service"
+	"gfast/app/service/cache_service"
 	"gfast/library/response"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
@@ -25,11 +26,16 @@ func (c *Dict) List(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, err.Error())
 	}
+	//菜单正常or停用状态
+	statusOptions, err := dict_service.GetDictWithDataByType("sys_normal_disable", "", "")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
 	result := g.Map{
 		"currentPage":  page,
 		"total":        total,
 		"list":         list,
-		"searchStatus": map[string]string{"": "所有", "0": "停用", "1": "正常"},
+		"searchStatus": statusOptions,
 	}
 	response.SusJson(true, r, "字典列表", result)
 }
@@ -51,6 +57,8 @@ func (c *Dict) Add(r *ghttp.Request) {
 			g.Log().Error(err.Error())
 			response.FailJson(true, r, "字典类型添加失败")
 		}
+		//清除tag缓存
+		cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 		response.SusJson(true, r, "添加字典成功")
 	}
 }
@@ -71,14 +79,16 @@ func (c *Dict) Edit(r *ghttp.Request) {
 		if err != nil {
 			response.FailJson(true, r, err.Error())
 		}
+		//清除tag缓存
+		cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 		response.SusJson(true, r, "修改成功")
 	}
-	id := r.GetInt("id")
+	id := r.GetInt("dictId")
 	entity, err := dict_service.GetDictById(id)
 	if err != nil {
-		response.FailJson(true, r, "字典类型添加失败")
+		response.FailJson(true, r, "字典数据获取失败")
 	}
-	response.SusJson(true, r, "ok", g.Map{"dict": entity})
+	response.SusJson(true, r, "ok", entity)
 }
 
 //字典数据列表
@@ -93,11 +103,18 @@ func (c *Dict) DataList(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, err.Error())
 	}
+
+	//菜单正常or停用状态
+	statusOptions, err := dict_service.GetDictWithDataByType("sys_normal_disable", "", "")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+
 	result := g.Map{
 		"currentPage":  page,
 		"total":        total,
 		"list":         list,
-		"searchStatus": map[string]string{"": "所有", "0": "停用", "1": "正常"},
+		"searchStatus": statusOptions,
 	}
 	response.SusJson(true, r, "ok", result)
 }
@@ -115,15 +132,10 @@ func (c *Dict) DataAdd(r *ghttp.Request) {
 		if err != nil {
 			response.FailJson(true, r, err.Error())
 		}
+		//清除tag缓存
+		cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 		response.SusJson(true, r, "添加字典数据成功")
 	}
-	dictType := r.GetQueryString("dictType")
-	res := g.Map{
-		"listClassSelector": g.Map{"default": "默认", "primary": "主要", "success": "成功", "info": "信息",
-			"warning": "警告", "danger": "危险"},
-		"dictType": dictType,
-	}
-	response.SusJson(true, r, "ok", res)
 }
 
 //修改字典数据
@@ -139,21 +151,17 @@ func (c *Dict) DataEdit(r *ghttp.Request) {
 		if err != nil {
 			response.FailJson(true, r, err.Error())
 		}
+		//清除tag缓存
+		cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 		response.SusJson(true, r, "修改字典数据成功")
-
 	}
 	dictCode := r.GetInt("dictCode")
 	dictData, err := dict_service.GetDictDataById(dictCode)
 	if err != nil {
 		response.FailJson(true, r, err.Error())
 	}
-	res := g.Map{
-		"listClassSelector": g.Map{"default": "默认", "primary": "主要", "success": "成功", "info": "信息",
-			"warning": "警告", "danger": "危险"},
-		"dictType": dictData.DictType,
-		"dictData": dictData,
-	}
-	response.SusJson(true, r, "ok", res)
+
+	response.SusJson(true, r, "ok", dictData)
 }
 
 //删除字典
@@ -166,12 +174,14 @@ func (c *Dict) Delete(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, "删除失败")
 	}
+	//清除tag缓存
+	cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 	response.SusJson(true, r, "删除成功")
 }
 
 //删除字典数据
 func (c *Dict) DataDelete(r *ghttp.Request) {
-	dictCodes := r.GetInts("dictCode")
+	dictCodes := r.GetInts("ids")
 	if len(dictCodes) == 0 {
 		response.FailJson(true, r, "删除失败")
 	}
@@ -179,5 +189,40 @@ func (c *Dict) DataDelete(r *ghttp.Request) {
 	if err != nil {
 		response.FailJson(true, r, "删除失败")
 	}
+	//清除tag缓存
+	cache_service.New().RemoveByTag(cache_service.AdminSysConfigTag)
 	response.SusJson(true, r, "删除成功")
 }
+
+/**
+状态
+*/
+func (c *Dict) SysNormalDisable(r *ghttp.Request) {
+	//菜单正常or停用状态
+	statusOptions, err := dict_service.GetDictWithDataByType("sys_normal_disable", "", "")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "", statusOptions)
+
+}
+
+func (c *Dict) SysCommonStatus(r *ghttp.Request) {
+	//获取相关选项
+	logStatus, err := dict_service.GetDictWithDataByType("sys_oper_log_status", "", "全部")
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+
+	response.SusJson(true, r, "ok", logStatus)
+}
+
+// 获取字典选择框列表
+func (c *Dict) OptionSelect(r *ghttp.Request) {
+	//获取所有字典类型列表
+	list, err := dict_service.GetAllDictType()
+	if err != nil {
+		response.FailJson(true, r, err.Error())
+	}
+	response.SusJson(true, r, "ok", list)
+}