修改部分问题

data/domain/DoMain.go

@@ -113,6 +113,36 @@ func (receiver BackRoleMenu) String() string {
 	return fmt.Sprint("BackRoleMenu{Id:", receiver.Id, ",RoleId:", receiver.RoleId, ",MenuId:", receiver.MenuId, "}")
 }
 
+// DictData 字典数据
+type DictData struct {
+	Id        int64  `json:"id"`                           // 11 0 注释：
+	Sort      int64  `xorm:"sort"  json:"sort"`            // 11 0 注释：排序
+	DictLabel string `xorm:"dict_label"  json:"dictLabel"` // 255 0 注释：字典标签
+	DictValue string `xorm:"dict_value"  json:"dictValue"` // 255 0 注释：字典值
+	DictType  string `xorm:"dict_type"  json:"dictType"`   // 255 0 注释：字典类型
+	Status    string `xorm:"status"  json:"status"`        // 5 0 注释：状态
+	CssStyle  string `xorm:"css_style"  json:"cssStyle"`   // 50 0 注释：样式
+	IsDefault string `xorm:"is_default"  json:"isDefault"` // 5 0 注释：是否默认
+	Remark    string `xorm:"remark"  json:"remark"`        // 255 0 注释：备注
+}
+
+func (receiver DictData) String() string {
+	return fmt.Sprint("DictData{Id:", receiver.Id, ",Sort:", receiver.Sort, ",DictLabel:", receiver.DictLabel, ",DictValue:", receiver.DictValue, ",DictType:", receiver.DictType, ",Status:", receiver.Status, ",CssStyle:", receiver.CssStyle, ",IsDefault:", receiver.IsDefault, ",Remark:", receiver.Remark, "}")
+}
+
+// DictType 字典类型
+type DictType struct {
+	Id       int64  `json:"id"`                         // 11 0 注释：
+	DictName string `xorm:"dict_name"  json:"dictName"` // 50 0 注释：字典名
+	DictType string `xorm:"dict_type"  json:"dictType"` // 50 0 注释：字典值
+	Status   string `xorm:"status"  json:"status"`      // 5 0 注释：状态
+	Remark   string `xorm:"remark"  json:"remark"`      // 255 0 注释：备注
+}
+
+func (receiver DictType) String() string {
+	return fmt.Sprint("DictType{Id:", receiver.Id, ",DictName:", receiver.DictName, ",DictType:", receiver.DictType, ",Status:", receiver.Status, ",Remark:", receiver.Remark, "}")
+}
+
 // GenTable
 type GenTable struct {
 	Id           int64  `json:"id"`                                 // 11 0 注释：id

router/BackRouter.go

@@ -15,6 +15,10 @@ func BaseBackRouter(group *gin.RouterGroup) {
 	BaseBackRoleRouter(group)
 	BaseBackRoleAuthorityRouter(group)
 	BaseBackRoleMenuRouter(group)
+
+	BaseDictTypeRouter(group)
+	BaseDictDataRouter(group)
+
 	BaseGoodsRouter(group)
 	BaseGoodsCommodityAreaRouter(group)
 	BaseGoodsCouponRouter(group)

router/BasaeBackRouter.go

@@ -6,6 +6,7 @@ import (
 	"demo/share"
 	"encoding/json"
 	"github.com/gin-gonic/gin"
+	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/cast"
 )
 
@@ -17,6 +18,8 @@ import (
 //BaseBackRoleRouter(group)
 //BaseBackRoleAuthorityRouter(group)
 //BaseBackRoleMenuRouter(group)
+//BaseDictDataRouter(group)
+//BaseDictTypeRouter(group)
 //BaseGenTableRouter(group)
 //BaseGenTableColumnRouter(group)
 //BaseGoodsRouter(group)
@@ -113,6 +116,26 @@ func BaseBackRoleMenuRouter(group *gin.RouterGroup) {
 	PushRouter(BaseBackRoleMenuGroup, "DELETE", "/backRoleMenu", DeleteBaseBackRoleMenu)
 }
 
+func BaseDictDataRouter(group *gin.RouterGroup) {
+	BaseDictDataGroup := group.Group("/back/base")
+	PushRouter(BaseDictDataGroup, "GET", "/dictData", GetBaseDictDataById)
+	PushRouter(BaseDictDataGroup, "POST", "/dictData/list", GetBaseDictDataList)
+	PushRouter(BaseDictDataGroup, "POST", "/dictData/in", GetBaseDictDataListInId)
+	PushRouter(BaseDictDataGroup, "POST", "/dictData", SaveBaseDictData)
+	PushRouter(BaseDictDataGroup, "PUT", "/dictData", UpdateBaseDictData)
+	PushRouter(BaseDictDataGroup, "DELETE", "/dictData", DeleteBaseDictData)
+}
+
+func BaseDictTypeRouter(group *gin.RouterGroup) {
+	BaseDictTypeGroup := group.Group("/back/base")
+	PushRouter(BaseDictTypeGroup, "GET", "/dictType", GetBaseDictTypeById)
+	PushRouter(BaseDictTypeGroup, "POST", "/dictType/list", GetBaseDictTypeList)
+	PushRouter(BaseDictTypeGroup, "POST", "/dictType/in", GetBaseDictTypeListInId)
+	PushRouter(BaseDictTypeGroup, "POST", "/dictType", SaveBaseDictType)
+	PushRouter(BaseDictTypeGroup, "PUT", "/dictType", UpdateBaseDictType)
+	PushRouter(BaseDictTypeGroup, "DELETE", "/dictType", DeleteBaseDictType)
+}
+
 func BaseGenTableRouter(group *gin.RouterGroup) {
 	BaseGenTableGroup := group.Group("/back/base")
 	PushRouter(BaseGenTableGroup, "GET", "/genTable", GetBaseGenTableById)
@@ -831,6 +854,148 @@ func DeleteBaseBackRoleMenu(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
 
+func GetBaseDictDataById(c *gin.Context) {
+	id := c.Param("id")
+	dictData, err := manage.GetDictDataById(cast.ToInt64(id))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "用户查询不存在"))
+	}
+	c.JSON(200, CreateResultData(dictData))
+}
+
+func GetBaseDictDataList(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	param, _ := data("param")
+	pageNum, _ := data("pageNum")
+	pageSize, _ := data("pageSize")
+	dictData := domain.DictData{}
+	err := mapstructure.Decode(param, &dictData)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "json转换错误"))
+	}
+	list, err := manage.GetDictDataList(dictData, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func GetBaseDictDataListInId(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	idsString, _ := data("ids")
+	var ids []int64
+	err := json.Unmarshal([]byte(cast.ToString(idsString)), &ids)
+	list, err := manage.GetDictDataListInId(ids)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func SaveBaseDictData(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	dictDataParam, _ := data("dictData")
+	dictData := domain.DictData{}
+	err := json.Unmarshal([]byte(cast.ToString(dictDataParam)), &dictData)
+	saveDictData, err := manage.SaveDictData(&dictData)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "保存错误"))
+	}
+	c.JSON(200, CreateResultData(saveDictData))
+}
+
+func UpdateBaseDictData(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	dictData, _ := data("dictData")
+	id, _ := data("id")
+
+	setDictData, b, err := manage.SetDictData(cast.ToStringMap(dictData), cast.ToInt64(id))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+	}
+	c.JSON(200, CreateResultData(setDictData))
+}
+
+func DeleteBaseDictData(c *gin.Context) {
+	id := c.Param("id")
+	res := manage.DeleteDictData(cast.ToInt64(id))
+	if !res {
+		c.JSON(200, CreateResultError(500, "删除错误"))
+	}
+	c.JSON(200, CreateResult())
+}
+
+func GetBaseDictTypeById(c *gin.Context) {
+	id := c.Param("id")
+	dictType, err := manage.GetDictTypeById(cast.ToInt64(id))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "用户查询不存在"))
+	}
+	c.JSON(200, CreateResultData(dictType))
+}
+
+func GetBaseDictTypeList(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	param, _ := data("param")
+	pageNum, _ := data("pageNum")
+	pageSize, _ := data("pageSize")
+	dictType := domain.DictType{}
+	err := mapstructure.Decode(param, &dictType)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "json转换错误"))
+	}
+	list, err := manage.GetDictTypeList(dictType, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func GetBaseDictTypeListInId(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	idsString, _ := data("ids")
+	var ids []int64
+	err := json.Unmarshal([]byte(cast.ToString(idsString)), &ids)
+	list, err := manage.GetDictTypeListInId(ids)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "查询错误"))
+	}
+	c.JSON(200, CreateResultData(list))
+}
+
+func SaveBaseDictType(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	dictTypeParam, _ := data("dictType")
+	dictType := domain.DictType{}
+	err := json.Unmarshal([]byte(cast.ToString(dictTypeParam)), &dictType)
+	saveDictType, err := manage.SaveDictType(&dictType)
+	if err != nil {
+		c.JSON(200, CreateResultError(500, "保存错误"))
+	}
+	c.JSON(200, CreateResultData(saveDictType))
+}
+
+func UpdateBaseDictType(c *gin.Context) {
+	data := share.GetJsonAnyParam(c)
+	dictType, _ := data("dictType")
+	id, _ := data("id")
+
+	setDictType, b, err := manage.SetDictType(cast.ToStringMap(dictType), cast.ToInt64(id))
+	if err != nil || !b {
+		c.JSON(200, CreateResultError(500, "修改错误"))
+	}
+	c.JSON(200, CreateResultData(setDictType))
+}
+
+func DeleteBaseDictType(c *gin.Context) {
+	id := c.Param("id")
+	res := manage.DeleteDictType(cast.ToInt64(id))
+	if !res {
+		c.JSON(200, CreateResultError(500, "删除错误"))
+	}
+	c.JSON(200, CreateResult())
+}
+
 func GetBaseGenTableById(c *gin.Context) {
 	id := c.Param("id")
 	genTable, err := manage.GetGenTableById(cast.ToInt64(id))