更新2.1.2版本，优化部门、角色权限，增加上下级关系；增加登录、系统、短信日志;优化省市区编码

server/internal/logic/sys/provinces.go

@@ -9,11 +9,16 @@ package sys
 import (
 	"context"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
+	"hotgo/internal/library/hgorm"
+	"hotgo/internal/model/entity"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/internal/service"
+	"hotgo/utility/tree"
 	"hotgo/utility/validate"
 )
 
@@ -27,10 +32,48 @@ func init() {
 	service.RegisterSysProvinces(NewSysProvinces())
 }
 
+// Tree 关系树选项列表
+func (s *sSysProvinces) Tree(ctx context.Context) (list []g.Map, err error) {
+	var models []*entity.SysProvinces
+	if err = dao.SysProvinces.Ctx(ctx).Order("pid asc,id asc,sort asc").Scan(&models); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return list, err
+	}
+
+	list = gconv.SliceMap(models)
+	for k, v := range list {
+		list[k]["key"] = v["id"]
+		list[k]["label"] = v["title"]
+	}
+
+	return tree.GenTree(list), nil
+}
+
 // Delete 删除
 func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp) error {
 
-	_, err := dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Delete()
+	var (
+		models *entity.SysProvinces
+	)
+	err := dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Scan(&models)
+	if err != nil {
+		return err
+	}
+
+	if models == nil {
+		return gerror.New("数据不存在或已删除！")
+	}
+
+	pidExist, err := dao.SysProvinces.Ctx(ctx).Where("pid", models.Id).One()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return err
+	}
+	if !pidExist.IsEmpty() {
+		return gerror.New("请先删除该地区下得所有子级！")
+	}
+
+	_, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Delete()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return err
@@ -43,12 +86,32 @@ func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp)
 func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (err error) {
 	if in.Title == "" {
 		err = gerror.New("标题不能为空")
+		return
+	}
+
+	if in.Id <= 0 {
+		err = gerror.New("地区Id必须大于0")
+		return
+	}
+
+	// 关系树
+	in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.SysProvinces, in.Pid)
+	if err != nil {
 		return err
 	}
 
+	isUpdate := false
+	models, err := s.View(ctx, sysin.ProvincesViewInp{Id: in.Id})
+	if err != nil {
+		return
+	}
+
+	if models != nil {
+		isUpdate = true
+	}
+
 	// 修改
-	in.UpdatedAt = gtime.Now()
-	if in.Id > 0 {
+	if isUpdate {
 		_, err = dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Data(in).Update()
 		if err != nil {
 			err = gerror.Wrap(err, consts.ErrorORM)
@@ -59,7 +122,6 @@ func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (er
 	}
 
 	// 新增
-	in.CreatedAt = gtime.Now()
 	_, err = dao.SysProvinces.Ctx(ctx).Data(in).Insert()
 	if err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
@@ -97,19 +159,14 @@ func (s *sSysProvinces) Status(ctx context.Context, in sysin.ProvincesStatusInp)
 }
 
 // MaxSort 最大排序
-func (s *sSysProvinces) MaxSort(ctx context.Context, in sysin.ProvincesMaxSortInp) (*sysin.ProvincesMaxSortModel, error) {
-	var res sysin.ProvincesMaxSortModel
-
-	if in.Id > 0 {
-		if err := dao.SysProvinces.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
-			err = gerror.Wrap(err, consts.ErrorORM)
-			return nil, err
-		}
+func (s *sSysProvinces) MaxSort(ctx context.Context, in sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error) {
+	if err = dao.SysProvinces.Ctx(ctx).Fields(dao.SysProvinces.Columns().Sort).OrderDesc(dao.SysProvinces.Columns().Sort).Scan(&res); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return nil, err
 	}
 
-	res.Sort = res.Sort + 10
-
-	return &res, nil
+	res.Sort = res.Sort + g.Cfg().MustGet(ctx, "hotgo.admin.maxSortIncrement").Int()
+	return res, nil
 }
 
 // View 获取指定字典类型信息
@@ -126,12 +183,10 @@ func (s *sSysProvinces) View(ctx context.Context, in sysin.ProvincesViewInp) (re
 func (s *sSysProvinces) List(ctx context.Context, in sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error) {
 	mod := dao.SysProvinces.Ctx(ctx)
 
-	// 访问路径
 	if in.Title != "" {
 		mod = mod.WhereLike("title", "%"+in.Title+"%")
 	}
 
-	// 请求方式
 	if in.Status > 0 {
 		mod = mod.Where("status", in.Status)
 	}
@@ -153,3 +208,53 @@ func (s *sSysProvinces) List(ctx context.Context, in sysin.ProvincesListInp) (li
 
 	return list, totalCount, err
 }
+
+// ChildrenList 获取省市区下级列表
+func (s *sSysProvinces) ChildrenList(ctx context.Context, in sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error) {
+	mod := dao.SysProvinces.Ctx(ctx)
+
+	if in.Title != "" {
+		mod = mod.WhereLike("title", "%"+in.Title+"%")
+	}
+
+	if in.Pid > 0 {
+		mod = mod.Where("pid", in.Pid)
+	}
+
+	if in.Id > 0 {
+		mod = mod.Where("id", in.Id)
+	}
+
+	totalCount, err = mod.Count()
+	if err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return list, totalCount, err
+	}
+
+	if totalCount == 0 {
+		return list, totalCount, nil
+	}
+
+	if err = mod.Page(in.Page, in.PerPage).Order("sort asc,id desc").Scan(&list); err != nil {
+		err = gerror.Wrap(err, consts.ErrorORM)
+		return list, totalCount, err
+	}
+
+	return list, totalCount, err
+}
+
+// UniqueId 获取省市区下级列表
+func (s *sSysProvinces) UniqueId(ctx context.Context, in sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error) {
+	res = new(sysin.ProvincesUniqueIdModel)
+	res.IsUnique = true
+	if in.NewId == 0 {
+		return
+	}
+
+	if err = hgorm.IsUnique(ctx, dao.SysProvinces, g.Map{dao.Test.Columns().Id: in.NewId}, "", in.OldId); err != nil {
+		res.IsUnique = false
+		return res, nil
+	}
+
+	return res, nil
+}