From 264cb2bb5f8453f02ca1332ea960c8c4951985eb Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sat, 6 Nov 2021 15:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=B7=A5?= =?UTF-8?q?=E6=AE=B5=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/examtestpage/grouphandle.go | 54 ++++++++++++++++++----- server/commonus/errormsg.go | 3 ++ server/log/server_info.log | 48 ++++++++++++++++++++ server/model/testpage/grouptree.go | 2 +- server/model/wechat/grouptree.go | 15 ++++--- server/router/examtestpage/grouphandle.go | 8 ++-- 6 files changed, 108 insertions(+), 22 deletions(-) create mode 100644 server/commonus/errormsg.go diff --git a/server/api/v1/examtestpage/grouphandle.go b/server/api/v1/examtestpage/grouphandle.go index 2750eb3..a5b99a3 100644 --- a/server/api/v1/examtestpage/grouphandle.go +++ b/server/api/v1/examtestpage/grouphandle.go @@ -2,6 +2,7 @@ package examtestpage import ( "fmt" + "strconv" "github.com/flipped-aurora/gin-vue-admin/server/commonus" "github.com/flipped-aurora/gin-vue-admin/server/global" @@ -20,7 +21,8 @@ type GroupMap struct { Name string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"` //'组织名称', Time int64 `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"` //'编辑时间', Parentid int64 `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"` - Sate int8 `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"` //'状态', + Sate int8 `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"` //'状态', + JinDieId int64 `json:"jindieid" gorm:"column:g_jindie_id;type:bigint(20) unsigned;default:0;not null;comment:金蝶ID"` //金蝶ID } type TableData struct { @@ -63,8 +65,8 @@ func (g *GroupHandleApi) GroupList(c *gin.Context) { groupTypeStruct.ID = v.Id groupTypeStruct.Name = v.Name groupTypeStruct.Address = true - groupTypeStruct.WxId = "" - groupTypeStruct.JdId = "" + groupTypeStruct.WxId = strconv.FormatInt(v.Id, 10) + groupTypeStruct.JdId = strconv.FormatInt(v.JinDieId, 10) groupTypeStruct.Attributes = 1 groupTypeStruct.Sort = i + 1 groupTypeStruct.Date = commonus.TimeStampToDate(v.Time, 6) @@ -92,7 +94,7 @@ func openGroupMap(data []testpage.BranchFactoryHasMany) []TableData { if v.Set != 1 { kk.Address = false } - kk.WxId = "" + kk.WxId = strconv.FormatInt(v.WechatId, 10) kk.JdId = "" kk.Attributes = v.Attribute kk.Sort = i + 1 @@ -121,6 +123,10 @@ func openGroupMap(data []testpage.BranchFactoryHasMany) []TableData { } //获取集团信息 +/* +@id 集团ID +*/ + func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) { var id postGroupCanshu _ = c.ShouldBindJSON(&id) //获取提交的参数 @@ -130,14 +136,40 @@ func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) { response.Result(100, groupStruct, "获取失败", c) return } - fmt.Printf("====>%v\n", id.Id) + // fmt.Printf("====>%v\n", id.Id) response.Result(200, groupStruct, "获取成功", c) } -func (g *GroupHandleApi) GetGroupInfos(c *gin.Context) { - var ids postGroupCanshu - _ = c.ShouldBindJSON(&ids) - // name := c.Query("id") - fmt.Printf("====>%v\n", ids.Id) - response.Ok(c) +/*获取子公司信息 +@id 子公司ID +*/ +func (g *GroupHandleApi) GetSubsidiaryInfo(c *gin.Context) { + var id postGroupCanshu + _ = c.ShouldBindJSON(&id) //获取提交的参数 + var subsidiaryStruct testpage.BranchFactory //子公司表结构 + err := global.GVA_DB_Master.Where("bf_id = ?", id.Id).First(&subsidiaryStruct).Error //获取子公司信息 + if err != nil { + response.Result(100, subsidiaryStruct, "获取失败", c) + return + } + response.Result(200, subsidiaryStruct, "获取成功", c) +} + +/*获取工段信息 +@id 工段ID +*/ +func (g *GroupHandleApi) GetGroupPositionInfo(c *gin.Context) { + var id postGroupCanshu + _ = c.ShouldBindJSON(&id) //获取提交的参数 + fmt.Printf("%v====>%T\n", id.Id, id) + if id.Id == 0 { + response.Result(101, id, "您的参数不正确！请检查您的提交！", c) + } + var workShopesStruct testpage.WorkShopsection //工段表结构 + err := global.GVA_DB_Master.Where("ws_id = ?", id.Id).First(&workShopesStruct).Error //获取工段信息 + if err != nil { + response.Result(100, workShopesStruct, "获取失败", c) + return + } + response.Result(200, workShopesStruct, "获取成功", c) } diff --git a/server/commonus/errormsg.go b/server/commonus/errormsg.go new file mode 100644 index 0000000..2695a53 --- /dev/null +++ b/server/commonus/errormsg.go @@ -0,0 +1,3 @@ +package commonus + +var () diff --git a/server/log/server_info.log b/server/log/server_info.log index 688d72f..4682350 100644 --- a/server/log/server_info.log +++ b/server/log/server_info.log @@ -613,3 +613,51 @@ [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.546 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.557 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 13:47:21.564 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.237 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.251 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.264 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:30:43.268 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.933 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.948 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.948 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.949 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.958 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:32:38.962 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.165 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.186 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.187 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.187 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.198 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:34:00.202 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.762 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.781 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.782 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.782 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.792 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:35:12.805 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.016 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.029 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.039 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:47:06.051 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.230 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.252 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.252 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.253 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.269 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:49:44.277 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.526 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.550 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.550 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.551 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.561 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 14:55:16.577 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.613 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.627 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.639 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:87 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 15:00:05.661 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} diff --git a/server/model/testpage/grouptree.go b/server/model/testpage/grouptree.go index 7b725aa..e379371 100644 --- a/server/model/testpage/grouptree.go +++ b/server/model/testpage/grouptree.go @@ -24,7 +24,7 @@ type BranchFactoryHasMany struct { Time int64 `json:"time" gorm:"column:bf_time;type:bigint(20) unsigned;default:0;not null;comment:添加时间"` //'0', Attribute int8 `json:"attribute" gorm:"column:bf_attribute;type:tinyint(1) unsigned;default:1;not null;comment:属性（1：私有；2：共享）"` //'属性（1：私有；2：共享）', Group int64 `json:"group" gorm:"column:bf_group;type:bigint(20) unsigned;default:0;not null;comment:集团公司"` //'集团公司', - WechatId int `json:"wechatid" gorm:"column:bf_wechat_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"` //'对照微信id', + WechatId int64 `json:"wechatid" gorm:"column:bf_wechat_id;type:int(4) unsigned;default:0;not null;comment:对照微信id"` //'对照微信id', WorkshopSectionStruct []WorkShopsection `gorm:"foreignKey:ws_bf_id";references:"bf_id"` } diff --git a/server/model/wechat/grouptree.go b/server/model/wechat/grouptree.go index 97757cc..34d10d9 100644 --- a/server/model/wechat/grouptree.go +++ b/server/model/wechat/grouptree.go @@ -2,13 +2,14 @@ package wechat type GroupForm struct { Id int64 `json:"id" gorm:"column:g_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"` - Name string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"` //'组织名称', - Parentid int64 `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"` //'父级栏目', - Orderes int64 `json:"orderes" gorm:"column:g_order;type:bigint(20) unsigned;default:0;not null;comment:企业微信排序"` //'企业微信排序', - Time int64 `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"` //'编辑时间', - Sate int8 `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"` //'状态', - Group string `json:"group" gorm:"column:g_group;type:text;not null;comment:组织结构"` //'组织结构', - GroupSun string `json:"groupsun" gorm:"column:g_group_sun;type:text;not null;comment:组织结构"` //'子节点', + Name string `json:"name" gorm:"column:g_name;type:varchar(255);not null;comment:组织名称"` //'组织名称', + Parentid int64 `json:"parentid" gorm:"column:g_parentid;type:bigint(20) unsigned;default:0;not null;comment:父级栏目"` //'父级栏目', + Orderes int64 `json:"orderes" gorm:"column:g_order;type:bigint(20) unsigned;default:0;not null;comment:企业微信排序"` //'企业微信排序', + Time int64 `json:"time" gorm:"column:g_time;type:bigint(20) unsigned;default:0;not null;comment:编辑时间"` //'编辑时间', + Sate int8 `json:"state" gorm:"column:g_sate;type:tinyint(1) unsigned;default:1;not null;comment:状态"` //'状态', + Group string `json:"group" gorm:"column:g_group;type:text;not null;comment:组织结构"` //'组织结构', + GroupSun string `json:"groupsun" gorm:"column:g_group_sun;type:text;not null;comment:组织结构"` //'子节点', + JinDieId int64 `json:"jindieid" gorm:"column:g_jindie_id;type:bigint(20) unsigned;default:0;not null;comment:金蝶ID"` //金蝶ID } func (GroupForm *GroupForm) TableName() string { diff --git a/server/router/examtestpage/grouphandle.go b/server/router/examtestpage/grouphandle.go index 6447974..a58fe2b 100644 --- a/server/router/examtestpage/grouphandle.go +++ b/server/router/examtestpage/grouphandle.go @@ -5,14 +5,16 @@ import ( "github.com/gin-gonic/gin" ) +//集团框架相关处理数据 type GroupHandleRouter struct{} func (g *GroupHandleRouter) InitGroupRouter(Router *gin.RouterGroup) { shiyanCodeRouter := Router.Group("group") var authorityApi = v1.ApiGroupApp.GroupHandleApiGroup.GroupHandleApi { - shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList) // 获取集团架构列表 - shiyanCodeRouter.POST("/getgroupinfo", authorityApi.GetGroupInfo) // 获取集团详细信息 - shiyanCodeRouter.POST("/getgroupinfos", authorityApi.GetGroupInfos) // 获取集团详细信息 + shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList) // 获取集团架构列表 + shiyanCodeRouter.POST("/getgroupinfo", authorityApi.GetGroupInfo) // 获取集团详细信息 + shiyanCodeRouter.POST("/getsubsidiaryinfo", authorityApi.GetSubsidiaryInfo) // 获取子公司详细信息 + shiyanCodeRouter.POST("/getgrouppositioninfo", authorityApi.GetGroupPositionInfo) // 获取工段详细信息 } }