Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	template/v4/dto.go.template

app/admin/apis/process/wf_classify.go

@@ -0,0 +1,189 @@
+package process
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/service"
+	"net/http"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+	"go-admin/common/log"
+	"go-admin/tools"
+)
+
+type WfProcessClassify struct {
+	apis.Api
+}
+
+func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) {
+	msgID := tools.GenerateMsgIDFromContext(c)
+	d := new(dto.WfProcessClassifySearch)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]models.WfProcessClassify, 0)
+	var count int64
+	serviceStudent := service.WfProcessClassify{}
+	serviceStudent.MsgID = msgID
+	serviceStudent.Orm = db
+	err = serviceStudent.GetWfProcessClassifyPage(d, p, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) {
+	control := new(dto.WfProcessClassifyById)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object models.WfProcessClassify
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceWfProcessClassify := service.WfProcessClassify{}
+	serviceWfProcessClassify.MsgID = msgID
+	serviceWfProcessClassify.Orm = db
+	err = serviceWfProcessClassify.GetWfProcessClassify(control, p, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) {
+	control := new(dto.WfProcessClassifyControl)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(tools.GetUserId(c))
+
+	serviceWfProcessClassify := service.WfProcessClassify{}
+	serviceWfProcessClassify.Orm = db
+	serviceWfProcessClassify.MsgID = msgID
+	err = serviceWfProcessClassify.InsertWfProcessClassify(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) {
+	control := new(dto.WfProcessClassifyControl)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(tools.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceWfProcessClassify := service.WfProcessClassify{}
+	serviceWfProcessClassify.Orm = db
+	serviceWfProcessClassify.MsgID = msgID
+	err = serviceWfProcessClassify.UpdateWfProcessClassify(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *WfProcessClassify) DeleteWfProcessClassify(c *gin.Context) {
+	control := new(dto.WfProcessClassifyById)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	// 设置编辑人
+	control.SetUpdateBy(tools.GetUserId(c))
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceWfProcessClassify := service.WfProcessClassify{}
+	serviceWfProcessClassify.Orm = db
+	serviceWfProcessClassify.MsgID = msgID
+	err = serviceWfProcessClassify.RemoveWfProcessClassify(control, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}

app/admin/apis/sys_china_area_data/sys_china_area_data.go

@@ -0,0 +1,189 @@
+package sys_china_area_data
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/service"
+	"net/http"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+	"go-admin/common/log"
+	"go-admin/tools"
+)
+
+type SysChinaAreaData struct {
+	apis.Api
+}
+
+func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
+	msgID := tools.GenerateMsgIDFromContext(c)
+	d := new(dto.SysChinaAreaDataSearch)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]models.SysChinaAreaData, 0)
+	var count int64
+	serviceStudent := service.SysChinaAreaData{}
+	serviceStudent.MsgID = msgID
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
+	control := new(dto.SysChinaAreaDataById)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object models.SysChinaAreaData
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.MsgID = msgID
+	serviceSysChinaAreaData.Orm = db
+	err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
+	control := new(dto.SysChinaAreaDataControl)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(tools.GetUserId(c))
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.MsgID = msgID
+	err = serviceSysChinaAreaData.InsertSysChinaAreaData(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
+	control := new(dto.SysChinaAreaDataControl)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(tools.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.MsgID = msgID
+	err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
+	control := new(dto.SysChinaAreaDataById)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := tools.GenerateMsgIDFromContext(c)
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	// 设置编辑人
+	control.SetUpdateBy(tools.GetUserId(c))
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.MsgID = msgID
+	err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}

app/admin/apis/tools/gen.go

@@ -21,17 +21,17 @@ func Preview(c *gin.Context) {
 	id, err := tools2.StringToInt(c.Param("tableId"))
 	tools2.HasError(err, "", -1)
 	table.TableId = id
-	t1, err := template.ParseFiles("template/v3/model.go.template")
+	t1, err := template.ParseFiles("template/v4/model.go.template")
 	tools2.HasError(err, "", -1)
-	t2, err := template.ParseFiles("template/v3/no_actions/apis.go.template")
+	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
 	tools2.HasError(err, "", -1)
-	t3, err := template.ParseFiles("template/v3/js.go.template")
+	t3, err := template.ParseFiles("template/v4/js.go.template")
 	tools2.HasError(err, "", -1)
-	t4, err := template.ParseFiles("template/v3/vue.go.template")
+	t4, err := template.ParseFiles("template/v4/vue.go.template")
 	tools2.HasError(err, "", -1)
-	t5, err := template.ParseFiles("template/v3/no_actions/router_check_role.go.template")
+	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
 	tools2.HasError(err, "", -1)
-	t6, err := template.ParseFiles("template/v3/dto.go.template")
+	t6, err := template.ParseFiles("template/v4/dto.go.template")
 	tools2.HasError(err, "", -1)
 
 	db, err := tools2.GetOrm(c)
@@ -95,7 +95,7 @@ func GenCodeV3(c *gin.Context) {
 
 func NOActionsGenV3(tab tools.SysTables) {
 
-	basePath := "template/v3/"
+	basePath := "template/v4/"
 	routerFile := basePath + "no_actions/router_check_role.go.template"
 
 	if tab.IsAuth == 2 {
@@ -149,7 +149,7 @@ func NOActionsGenV3(tab tools.SysTables) {
 }
 
 func ActionsGenV3(tab tools.SysTables) {
-	basePath := "template/v3/"
+	basePath := "template/v4/"
 	routerFile := basePath + "actions/router_check_role.go.template"
 
 	if tab.IsAuth == 2 {
@@ -234,7 +234,7 @@ func GenMenuAndApi(c *gin.Context) {
 	Cmenu.Path = tab.TBName
 	Cmenu.MenuType = "C"
 	Cmenu.Action = "无"
-	Cmenu.Permission = tab.ModuleName + ":" + tab.BusinessName + ":list"
+	Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list"
 	Cmenu.ParentId = Mmenu.MenuId
 	Cmenu.NoCache = false
 	Cmenu.Component = "/" + tab.BusinessName + "/index"
@@ -254,7 +254,7 @@ func GenMenuAndApi(c *gin.Context) {
 	MList.Path = tab.TBName
 	MList.MenuType = "F"
 	MList.Action = "无"
-	MList.Permission = tab.ModuleName + ":" + tab.BusinessName + ":query"
+	MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query"
 	MList.ParentId = Cmenu.MenuId
 	MList.NoCache = false
 	MList.Sort = 0
@@ -273,7 +273,7 @@ func GenMenuAndApi(c *gin.Context) {
 	MCreate.Path = tab.TBName
 	MCreate.MenuType = "F"
 	MCreate.Action = "无"
-	MCreate.Permission = tab.ModuleName + ":" + tab.BusinessName + ":add"
+	MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add"
 	MCreate.ParentId = Cmenu.MenuId
 	MCreate.NoCache = false
 	MCreate.Sort = 0
@@ -292,7 +292,7 @@ func GenMenuAndApi(c *gin.Context) {
 	MUpdate.Path = tab.TBName
 	MUpdate.MenuType = "F"
 	MUpdate.Action = "无"
-	MUpdate.Permission = tab.ModuleName + ":" + tab.BusinessName + ":edit"
+	MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit"
 	MUpdate.ParentId = Cmenu.MenuId
 	MUpdate.NoCache = false
 	MUpdate.Sort = 0
@@ -311,7 +311,7 @@ func GenMenuAndApi(c *gin.Context) {
 	MDelete.Path = tab.TBName
 	MDelete.MenuType = "F"
 	MDelete.Action = "无"
-	MDelete.Permission = tab.ModuleName + ":" + tab.BusinessName + ":remove"
+	MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove"
 	MDelete.ParentId = Cmenu.MenuId
 	MDelete.NoCache = false
 	MDelete.Sort = 0
@@ -433,4 +433,4 @@ func GenMenuAndApi(c *gin.Context) {
 	ADelete.MenuId, err = ADelete.Create(db)
 
 	app.OK(c, "", "数据生成成功！")
-}
+}

app/admin/apis/tools/systables.go

@@ -232,8 +232,8 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 			column.IsPk = "1"
 			column.Pk = true
 			data.PkColumn = dbcolumn[i].ColumnName
-			column.GoField = strings.ToUpper(column.GoField)
-			column.JsonField = strings.ToUpper(column.JsonField)
+			//column.GoField = strings.ToUpper(column.GoField)
+			//column.JsonField = strings.ToUpper(column.JsonField)
 			data.PkGoField = column.GoField
 			data.PkJsonField = column.JsonField
 		}
@@ -245,10 +245,8 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 
 		if strings.Contains(dbcolumn[i].ColumnType, "int") {
 			if strings.Contains(dbcolumn[i].ColumnKey, "PR") {
-				column.GoType = "uint"
-			} else if strings.Contains(dbcolumn[i].ColumnType, "unsigned") {
-				column.GoType = "uint"
-			} else {
+				column.GoType = "int"
+			}  else {
 				column.GoType = "string"
 			}
 			column.HtmlType = "input"

app/admin/models/sys_file_dir.go

@@ -36,5 +36,5 @@ func (e *SysFileDir) Generate() models.ActiveRecord {
 }
 
 func (e *SysFileDir) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/sys_file_info.go

@@ -27,5 +27,5 @@ func (e *SysFileInfo) Generate() models.ActiveRecord {
 }
 
 func (e *SysFileInfo) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/syscategory.go

@@ -25,5 +25,5 @@ func (e *SysCategory) Generate() models.ActiveRecord {
 }
 
 func (e *SysCategory) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/syschinaareadata.go

@@ -0,0 +1,30 @@
+package models
+
+import (
+	"go-admin/common/models"
+	"time"
+)
+
+type SysChinaAreaData struct {
+    models.Model
+    models.ControlBy
+    
+    PId string `json:"pId" gorm:"type:int(11);comment:上级编码"` 
+    Name string `json:"name" gorm:"type:varchar(128);comment:名称"` 
+    CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"` 
+    UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"` 
+    DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"` 
+}
+
+func (SysChinaAreaData) TableName() string {
+    return "sys_china_area_data"
+}
+
+func (e *SysChinaAreaData) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysChinaAreaData) GetId() interface{} {
+	return e.Id
+}

app/admin/models/system/sys_config.go

@@ -25,5 +25,5 @@ func (e *SysConfig) Generate() models.ActiveRecord {
 }
 
 func (e *SysConfig) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/system/sys_login_log.go

@@ -33,5 +33,5 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
 }
 
 func (e *SysLoginLog) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/system/sys_opera_log.go

@@ -41,5 +41,5 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
 }
 
 func (e *SysOperaLog) GetId() interface{} {
-	return e.ID
-}
+	return e.Id
+}

app/admin/models/wf_classify.go

@@ -0,0 +1,27 @@
+package models
+
+import (
+   // "gorm.io/gorm"
+
+	"go-admin/common/models"
+)
+
+type WfProcessClassify struct {
+    models.Model
+    models.ControlBy
+    
+    Name string `json:"name" gorm:"type:varchar(255);comment:名称"` 
+}
+
+func (WfProcessClassify) TableName() string {
+    return "wf_process_classify"
+}
+
+func (e *WfProcessClassify) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *WfProcessClassify) GetId() interface{} {
+	return e.Id
+}

app/admin/router/syschinaareadata.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/apis/sys_china_area_data"
+	"go-admin/app/admin/middleware"
+	jwt "go-admin/pkg/jwtauth"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter)
+}
+
+// 需认证的路由代码
+func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_china_area_data.SysChinaAreaData{}
+	r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", api.GetSysChinaAreaDataList)
+		r.GET("/:id", api.GetSysChinaAreaData)
+		r.POST("", api.InsertSysChinaAreaData)
+		r.PUT("/:id", api.UpdateSysChinaAreaData)
+		r.DELETE("", api.DeleteSysChinaAreaData)
+	}
+}

app/admin/router/wf_classify.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/apis/process"
+	"go-admin/app/admin/middleware"
+	jwt "go-admin/pkg/jwtauth"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerWfProcessClassifyRouter)
+}
+
+// 需认证的路由代码
+func registerWfProcessClassifyRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &process.WfProcessClassify{}
+	r := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", api.GetWfProcessClassifyList)
+		r.GET("/:id", api.GetWfProcessClassify)
+		r.POST("", api.InsertWfProcessClassify)
+		r.PUT("/:id", api.UpdateWfProcessClassify)
+		r.DELETE("", api.DeleteWfProcessClassify)
+	}
+}

app/admin/service/dto/sys_category.go

@@ -35,7 +35,7 @@ func (m *SysCategorySearch) Generate() dto.Index {
 }
 
 type SysCategoryControl struct {
-	ID int `uri:"ID" comment:"标识"` // 标识
+	ID int `uri:"Id" comment:"标识"` // 标识
 
 	Name string `json:"name" comment:"名称"`
 
@@ -69,7 +69,7 @@ func (s *SysCategoryControl) Generate() dto.Control {
 
 func (s *SysCategoryControl) GenerateM() (common.ActiveRecord, error) {
 	return &models.SysCategory{
-		Model:  common.Model{ID: s.ID},
+		Model:  common.Model{Id: s.ID},
 		Name:   s.Name,
 		Img:    s.Img,
 		Sort:   s.Sort,
@@ -93,4 +93,4 @@ func (s *SysCategoryById) Generate() dto.Control {
 
 func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) {
 	return &models.SysCategory{}, nil
-}
+}

app/admin/service/dto/sys_config.go

@@ -35,7 +35,7 @@ func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
 
 // SysConfigControl 增、改使用的结构体
 type SysConfigControl struct {
-	ID          int    `uri:"ID" comment:"编码"` // 编码
+	ID          int    `uri:"Id" comment:"编码"` // 编码
 	ConfigName  string `json:"configName" comment:""`
 	ConfigKey   string `uri:"configKey" json:"configKey" comment:""`
 	ConfigValue string `json:"configValue" comment:""`
@@ -67,7 +67,7 @@ func (s *SysConfigControl) Bind(ctx *gin.Context) error {
 // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
 func (s *SysConfigControl) Generate() (*system.SysConfig, error) {
 	return &system.SysConfig{
-		Model:       common.Model{ID: s.ID},
+		Model:       common.Model{Id: s.ID},
 		ConfigName:  s.ConfigName,
 		ConfigKey:   s.ConfigKey,
 		ConfigValue: s.ConfigValue,
@@ -112,4 +112,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
 
 func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
 	return &system.SysConfig{}, nil
-}
+}

app/admin/service/dto/sys_file_dir.go

@@ -13,7 +13,7 @@ import (
 type SysFileDirSearch struct {
 	dto.Pagination `search:"-"`
 
-	ID    int    `form:"ID" search:"type:exact;column:id;table:sys_file_dir" comment:"标识"`
+	ID    int    `form:"Id" search:"type:exact;column:id;table:sys_file_dir" comment:"标识"`
 	Label string `form:"label" search:"type:exact;column:label;table:sys_file_dir" comment:"目录名称"`
 	PId   string `form:"pId" search:"type:exact;column:p_id;table:sys_file_dir" comment:"上级目录"`
 	//Sort  string `form:"sort" search:"type:exact;column:sort;table:sys_file_dir" comment:"排序"`
@@ -39,7 +39,7 @@ func (m *SysFileDirSearch) Generate() dto.Index {
 }
 
 type SysFileDirControl struct {
-	ID       int    `uri:"ID" comment:"标识"` // 标识
+	ID       int    `uri:"Id" comment:"标识"` // 标识
 	Label    string `json:"label" comment:"目录名称"`
 	PId      int    `json:"pId" comment:"上级目录"`
 	Sort     string `json:"sort" comment:"排序"`
@@ -69,7 +69,7 @@ func (s *SysFileDirControl) Generate() dto.Control {
 
 func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) {
 	return &models.SysFileDir{
-		Model: common.Model{ID: s.ID},
+		Model: common.Model{Id: s.ID},
 		Label: s.Label,
 		PId:   s.PId,
 		//Sort:  s.Sort,
@@ -97,4 +97,4 @@ func (s *SysFileDirById) Generate() dto.Control {
 
 func (s *SysFileDirById) GenerateM() (common.ActiveRecord, error) {
 	return &models.SysFileDir{}, nil
-}
+}

app/admin/service/dto/sys_file_info.go

@@ -8,7 +8,7 @@ import (
 
 type SysFileInfoSearch struct {
 	dto.Pagination `search:"-"`
-	ID             int    `form:"ID" search:"type:exact;column:id;table:sys_file_info" comment:"标识"`
+	ID             int    `form:"Id" search:"type:exact;column:id;table:sys_file_info" comment:"标识"`
 	Type           string `form:"type" search:"type:exact;column:type;table:sys_file_info" comment:"类型"`
 	Name           string `form:"name" search:"type:exact;column:name;table:sys_file_info" comment:"名称"`
 	PId            string `form:"pId" search:"type:exact;column:p_id;table:sys_file_info" comment:"目录"`
@@ -34,7 +34,7 @@ type SysFileInfoControl struct {
 
 func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) {
 	return &models.SysFileInfo{
-		Model:     common.Model{ID: s.ID},
+		Model:     common.Model{Id: s.ID},
 		Type:      s.Type,
 		Name:      s.Name,
 		Size:      s.Size,
@@ -49,4 +49,4 @@ func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) {
 type SysFileInfoById struct {
 	dto.ObjectById
 	UpdateBy int `json:"-"`
-}
+}

app/admin/service/dto/sys_login_log.go

@@ -33,7 +33,7 @@ func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error {
 }
 
 type SysLoginLogControl struct {
-	ID            int       `uri:"ID" comment:"主键"` // 主键
+	ID            int       `uri:"Id" comment:"主键"` // 主键
 	Username      string    `json:"username" comment:"用户名"`
 	Status        string    `json:"status" comment:"状态"`
 	Ipaddr        string    `json:"ipaddr" comment:"ip地址"`
@@ -62,7 +62,7 @@ func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
 
 func (s *SysLoginLogControl) Generate() (*system.SysLoginLog, error) {
 	return &system.SysLoginLog{
-		Model:         common.Model{ID: s.ID},
+		Model:         common.Model{Id: s.ID},
 		Username:      s.Username,
 		Status:        s.Status,
 		Ipaddr:        s.Ipaddr,
@@ -110,4 +110,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById {
 
 func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) {
 	return &system.SysLoginLog{}, nil
-}
+}

app/admin/service/dto/sys_opera_log.go

@@ -35,7 +35,7 @@ func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error {
 }
 
 type SysOperaLogControl struct {
-	ID            int       `uri:"ID" comment:"编码"` // 编码
+	ID            int       `uri:"Id" comment:"编码"` // 编码
 	Title         string    `json:"title" comment:"操作模块"`
 	BusinessType  string    `json:"businessType" comment:"操作类型"`
 	BusinessTypes string    `json:"businessTypes" comment:""`
@@ -72,7 +72,7 @@ func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
 
 func (s *SysOperaLogControl) Generate() (*system.SysOperaLog, error) {
 	return &system.SysOperaLog{
-		Model:         common.Model{ID: s.ID},
+		Model:         common.Model{Id: s.ID},
 		Title:         s.Title,
 		BusinessType:  s.BusinessType,
 		BusinessTypes: s.BusinessTypes,
@@ -127,4 +127,4 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
 
 func (s *SysOperaLogById) SetUpdateBy(id int) {
 
-}
+}

app/admin/service/dto/syschinaareadata.go

@@ -0,0 +1,114 @@
+package dto
+
+import (
+	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	"go-admin/common/log"
+	common "go-admin/common/models"
+	"go-admin/tools"
+	"time"
+)
+
+type SysChinaAreaDataSearch struct {
+	dto.Pagination     `search:"-"`
+    PId string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
+
+    Name string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
+
+    
+}
+
+func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
+	return *m
+}
+
+func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
+    msgID := tools.GenerateMsgIDFromContext(ctx)
+    err := ctx.ShouldBind(m)
+    if err != nil {
+    	log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+    }
+    return err
+}
+
+type SysChinaAreaDataControl struct {
+    
+    Id int `uri:"id" comment:"编码"` // 编码
+
+    PId string `json:"pId" comment:"上级编码"`
+    
+
+    Name string `json:"name" comment:"名称"`
+    
+
+    CreateTime time.Time `json:"createTime" comment:""`
+    
+
+    UpdateTime time.Time `json:"updateTime" comment:""`
+    
+
+    DeleteTime time.Time `json:"deleteTime" comment:""`
+    
+}
+
+func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
+    msgID := tools.GenerateMsgIDFromContext(ctx)
+    err := ctx.ShouldBindUri(s)
+    if err != nil {
+        log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+        return err
+    }
+    err = ctx.ShouldBind(s)
+    if err != nil {
+        log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+    }
+    return err
+}
+
+func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
+	return &models.SysChinaAreaData{
+	
+        Model:     common.Model{ Id: s.Id },
+        PId:  s.PId,
+        Name:  s.Name,
+        CreateTime:  s.CreateTime,
+        UpdateTime:  s.UpdateTime,
+        DeleteTime:  s.DeleteTime,
+	}, nil
+}
+
+func (s *SysChinaAreaDataControl) GetId() interface{} {
+	return s.Id
+}
+
+type SysChinaAreaDataById struct {
+	Id  int   `uri:"id"`
+	Ids []int `json:"ids"`
+}
+
+func (s *SysChinaAreaDataById) GetId() interface{} {
+	if len(s.Ids) > 0 {
+		s.Ids = append(s.Ids, s.Id)
+		return s.Ids
+	}
+	return s.Id
+}
+
+func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
+	msgID := tools.GenerateMsgIDFromContext(ctx)
+	err := ctx.ShouldBindUri(s)
+	if err != nil {
+		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		return err
+	}
+	err = ctx.ShouldBind(s)
+	if err != nil {
+		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+	}
+	return err
+}
+
+func (s *SysChinaAreaDataById) SetUpdateBy(id int) {
+
+}

app/admin/service/dto/wf_classify.go

@@ -0,0 +1,97 @@
+package dto
+
+import (
+	"github.com/gin-gonic/gin"
+	//"gorm.io/gorm"
+
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	"go-admin/common/log"
+	common "go-admin/common/models"
+	"go-admin/tools"
+)
+
+type WfProcessClassifySearch struct {
+	dto.Pagination     `search:"-"`
+    Name string `form:"name" search:"type:contains;column:name;table:wf_process_classify" comment:"名称"`
+
+    
+}
+
+func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
+	return *m
+}
+
+func (m *WfProcessClassifySearch) Bind(ctx *gin.Context) error {
+    msgID := tools.GenerateMsgIDFromContext(ctx)
+    err := ctx.ShouldBind(m)
+    if err != nil {
+    	log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
+    }
+    return err
+}
+
+type WfProcessClassifyControl struct {
+    
+    Id int `uri:"id" comment:"编码"` // 编码
+
+    Name string `json:"name" comment:"名称"`
+    
+}
+
+func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
+    msgID := tools.GenerateMsgIDFromContext(ctx)
+    err := ctx.ShouldBindUri(s)
+    if err != nil {
+        log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+        return err
+    }
+    err = ctx.ShouldBind(s)
+    if err != nil {
+        log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+    }
+    return err
+}
+
+func (s *WfProcessClassifyControl) Generate() (*models.WfProcessClassify, error) {
+	return &models.WfProcessClassify{
+	
+        Model:     common.Model{ Id: s.Id },
+        Name:  s.Name,
+	}, nil
+}
+
+func (s *WfProcessClassifyControl) GetId() interface{} {
+	return s.Id
+}
+
+type WfProcessClassifyById struct {
+	Id  int   `uri:"id"`
+	Ids []int `json:"ids"`
+}
+
+func (s *WfProcessClassifyById) GetId() interface{} {
+	if len(s.Ids) > 0 {
+		s.Ids = append(s.Ids, s.Id)
+		return s.Ids
+	}
+	return s.Id
+}
+
+func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
+	msgID := tools.GenerateMsgIDFromContext(ctx)
+	err := ctx.ShouldBindUri(s)
+	if err != nil {
+		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		return err
+	}
+	err = ctx.ShouldBind(s)
+	if err != nil {
+		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+	}
+	return err
+}
+
+func (s *WfProcessClassifyById) SetUpdateBy(id int) {
+
+}

app/admin/service/sys_file_dir.go

@@ -144,11 +144,11 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
 	listGroup := *list
 	min := make([]models.SysFileDirL, 0)
 	for j := 0; j < len(listGroup); j++ {
-		if m.ID != listGroup[j].PId {
+		if m.Id != listGroup[j].PId {
 			continue
 		}
 		mi := models.SysFileDirL{}
-		mi.ID = listGroup[j].ID
+		mi.Id = listGroup[j].Id
 		mi.PId = listGroup[j].PId
 		mi.Label = listGroup[j].Label
 		//mi.Sort = listGroup[j].Sort
@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
 	}
 
 	return m
-}
+}

app/admin/service/syschinaareadata.go

@@ -0,0 +1,119 @@
+package service
+
+import (
+	"errors"
+	"go-admin/app/admin/models"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+	"go-admin/common/log"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/service"
+	"gorm.io/gorm"
+)
+
+type SysChinaAreaData struct {
+	service.Service
+}
+
+// GetSysChinaAreaDataPage 获取SysChinaAreaData列表
+func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
+	var err error
+	var data models.SysChinaAreaData
+	msgID := e.MsgID
+
+	err = e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// GetSysChinaAreaData 获取SysChinaAreaData对象
+func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
+	var err error
+	var data models.SysChinaAreaData
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId())
+	err = db.Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	if db.Error != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// InsertSysChinaAreaData 创建SysChinaAreaData对象
+func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error {
+	var err error
+	var data models.SysChinaAreaData
+	msgID := e.MsgID
+
+	err = e.Orm.Model(&data).
+		Create(model).Error
+	if err != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// UpdateSysChinaAreaData 修改SysChinaAreaData对象
+func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
+	var err error
+	var data models.SysChinaAreaData
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Where(c.GetId()).Updates(c)
+	if db.Error != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+
+	}
+	return nil
+}
+
+// RemoveSysChinaAreaData 删除SysChinaAreaData
+func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
+	var err error
+	var data models.SysChinaAreaData
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if db.Error != nil {
+		err = db.Error
+		log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		err = errors.New("无权删除该数据")
+		return err
+	}
+	return nil
+}

app/admin/service/wf_classify.go

@@ -0,0 +1,119 @@
+package service
+
+import (
+	"errors"
+	"go-admin/app/admin/models"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+	"go-admin/common/log"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/service"
+	"gorm.io/gorm"
+)
+
+type WfProcessClassify struct {
+	service.Service
+}
+
+// GetWfProcessClassifyPage 获取WfProcessClassify列表
+func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySearch, p *actions.DataPermission, list *[]models.WfProcessClassify, count *int64) error {
+	var err error
+	var data models.WfProcessClassify
+	msgID := e.MsgID
+
+	err = e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// GetWfProcessClassify 获取WfProcessClassify对象
+func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission, model *models.WfProcessClassify) error {
+	var err error
+	var data models.WfProcessClassify
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId())
+	err = db.Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	if db.Error != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// InsertWfProcessClassify 创建WfProcessClassify对象
+func (e *WfProcessClassify) InsertWfProcessClassify(model *models.WfProcessClassify) error {
+	var err error
+	var data models.WfProcessClassify
+	msgID := e.MsgID
+
+	err = e.Orm.Model(&data).
+		Create(model).Error
+	if err != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	return nil
+}
+
+// UpdateWfProcessClassify 修改WfProcessClassify对象
+func (e *WfProcessClassify) UpdateWfProcessClassify(c *models.WfProcessClassify, p *actions.DataPermission) error {
+	var err error
+	var data models.WfProcessClassify
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Where(c.GetId()).Updates(c)
+	if db.Error != nil {
+		log.Errorf("msgID[%s] db error:%s", msgID, err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+
+	}
+	return nil
+}
+
+// RemoveWfProcessClassify 删除WfProcessClassify
+func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission) error {
+	var err error
+	var data models.WfProcessClassify
+	msgID := e.MsgID
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if db.Error != nil {
+		err = db.Error
+		log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		err = errors.New("无权删除该数据")
+		return err
+	}
+	return nil
+}