diff --git a/server/DevelopLog.md b/server/DevelopLog.md new file mode 100644 index 0000000..e9118ad --- /dev/null +++ b/server/DevelopLog.md @@ -0,0 +1 @@ +### 开发记录 \ No newline at end of file diff --git a/server/api/v1/examtestpage/grouphandle.go b/server/api/v1/examtestpage/grouphandle.go index b589a02..2750eb3 100644 --- a/server/api/v1/examtestpage/grouphandle.go +++ b/server/api/v1/examtestpage/grouphandle.go @@ -35,34 +35,44 @@ type TableData struct { Children interface{} `json:"children"` } +//POST提交参数 +type postGroupCanshu struct { + Id int `json:"id" from:"id"` +} + //集团列表 func (g *GroupHandleApi) GroupList(c *gin.Context) { - var groupStruct []wechat.GroupForm //集团表结构 - var groupMap []GroupMap //要获取的集团架构字段 - err := global.GVA_DB_WatchDate.Model(&groupStruct).Where("g_parentid = ?", 1).Find(&groupMap) //获取集团信息 + var groupStruct []wechat.GroupForm //集团表结构 + var groupMap []GroupMap //要获取的集团架构字段 + var groupMapStruct []TableData + err := global.GVA_DB_WatchDate.Model(&groupStruct).Where("g_parentid = ?", 1).Find(&groupMap).Error //获取集团信息 if err != nil { - // return + fmt.Println(err) + response.Result(100, groupMapStruct, "集团架构获取失败！", c) + return } var departList []testpage.BranchFactoryHasMany // err = global.GVA_DB_Master.Preload("WorkshopSectionStruct").Where("bf_group = ?", 3).Find(&departList) // groupAry := map[int]interface{}{} - var groupMapStruct []TableData + for i, v := range groupMap { fmt.Printf("%v\n", v.Id) - err = global.GVA_DB_Master.Preload("WorkshopSectionStruct").Where("bf_group = ?", v.Id).Find(&departList) - var groupTypeStruct TableData - groupTypeStruct.ID = v.Id - groupTypeStruct.Name = v.Name - groupTypeStruct.Address = true - groupTypeStruct.WxId = "" - groupTypeStruct.JdId = "" - groupTypeStruct.Attributes = 1 - groupTypeStruct.Sort = i + 1 - groupTypeStruct.Date = commonus.TimeStampToDate(v.Time, 6) - groupTypeStruct.Children = openGroupMap(departList) - // groupAry[i] = openGroupMap(departList) - groupMapStruct = append(groupMapStruct, groupTypeStruct) - // common.TimeStampToDate(departList["Time"]) + err = global.GVA_DB_Master.Preload("WorkshopSectionStruct").Where("bf_group = ?", v.Id).Find(&departList).Error + if err == nil { + var groupTypeStruct TableData + groupTypeStruct.ID = v.Id + groupTypeStruct.Name = v.Name + groupTypeStruct.Address = true + groupTypeStruct.WxId = "" + groupTypeStruct.JdId = "" + groupTypeStruct.Attributes = 1 + groupTypeStruct.Sort = i + 1 + groupTypeStruct.Date = commonus.TimeStampToDate(v.Time, 6) + groupTypeStruct.Children = openGroupMap(departList) + // groupAry[i] = openGroupMap(departList) + groupMapStruct = append(groupMapStruct, groupTypeStruct) + } + } // fmt.Printf("%v\n", groupMap) @@ -111,4 +121,23 @@ func openGroupMap(data []testpage.BranchFactoryHasMany) []TableData { } //获取集团信息 -func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) {} +func (g *GroupHandleApi) GetGroupInfo(c *gin.Context) { + var id postGroupCanshu + _ = c.ShouldBindJSON(&id) //获取提交的参数 + var groupStruct wechat.GroupForm //集团表结构 + err := global.GVA_DB_WatchDate.Where("g_id = ?", id.Id).First(&groupStruct).Error //获取集团信息 + if err != nil { + response.Result(100, groupStruct, "获取失败", c) + return + } + 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) +} diff --git a/server/api/v1/shiyan/shiyan.go b/server/api/v1/shiyan/shiyan.go index 824b1fd..c942714 100644 --- a/server/api/v1/shiyan/shiyan.go +++ b/server/api/v1/shiyan/shiyan.go @@ -21,3 +21,23 @@ func (a *ShiyanApi) AddBaseMenu(c *gin.Context) { fmt.Printf("%v\n", answerMap) response.Ok(c) } + +//get请求获参 +func (a *ShiyanApi) GetRequestOperation(c *gin.Context) { + id := c.Query("id") + fmt.Printf("====>%v\n", id) + response.Ok(c) +} + +//get请求获参 +type postGroupCanshu struct { + Id int `json:"id" from:"id"` +} + +func (a *ShiyanApi) PostRequestOperation(c *gin.Context) { + var ids postGroupCanshu + _ = c.ShouldBindJSON(&ids) + // name := c.Query("id") + fmt.Printf("====>%v\n", ids.Id) + response.Ok(c) +} diff --git a/server/core/server.go b/server/core/server.go index 22392e7..881961a 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -37,12 +37,8 @@ func RunWindowsServer() { global.GVA_LOG.Info("server run success on ", zap.String("address", address)) fmt.Printf(` - 欢迎使用 github.com/flipped-aurora/gin-vue-admin/server - 当前版本:V2.4.6 Apache - 加群方式:微信号：shouzi_1994 QQ群：622360840 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html 默认前端文件运行地址:http://127.0.0.1:8080 - 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/coffee `, address) global.GVA_LOG.Error(s.ListenAndServe().Error()) } diff --git a/server/log/server_info.log b/server/log/server_info.log index d089ca3..2ac653f 100644 --- a/server/log/server_info.log +++ b/server/log/server_info.log @@ -535,3 +535,75 @@ [github.com/flipped-aurora/gin-vue-admin/server]2021/11/06 - 11:38:57.221 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 - 11:38:57.230 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 - 11:38:57.241 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 - 13:16:20.036 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 - 13:16:20.058 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 - 13:16:20.058 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 - 13:16:20.058 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:16:20.069 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:16:20.070 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 - 13:22:18.121 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 - 13:22:18.135 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 - 13:22:18.135 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 - 13:22:18.135 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:22:18.150 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:22:18.152 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 - 13:22:34.228 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 - 13:22:34.243 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 - 13:22:34.243 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 - 13:22:34.244 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:22:34.255 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:22:34.263 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 - 13:26:53.247 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 - 13:26:53.260 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 - 13:26:53.261 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 - 13:26:53.261 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:26:53.270 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:26:53.285 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 - 13:30:07.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 - 13:30:07.630 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 - 13:30:07.631 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 - 13:30:07.631 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:30:07.643 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:30:07.655 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 - 13:30:32.746 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 - 13:30:32.759 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 - 13:30:32.759 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 - 13:30:32.759 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:30:32.768 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:30:32.772 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 - 13:34:30.029 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 - 13:34:30.045 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 - 13:34:30.045 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 - 13:34:30.046 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:34:30.057 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:34:30.067 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 - 13:36:05.023 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 - 13:36:05.043 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 - 13:36:05.043 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 - 13:36:05.043 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:36:05.055 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:36:05.058 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 - 13:39:20.953 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 - 13:39:20.968 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 - 13:39:20.968 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 - 13:39:20.968 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:39:20.978 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:39:20.985 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 - 13:39:53.124 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 - 13:39:53.150 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 - 13:39:53.150 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 - 13:39:53.150 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:39:53.162 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:39:53.167 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 - 13:41:14.463 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 - 13:41:14.488 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 - 13:41:14.489 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 - 13:41:14.489 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:41:14.501 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:41:14.513 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 - 13:46:45.438 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 - 13:46:45.452 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 - 13:46:45.452 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 - 13:46:45.453 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:46:45.462 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:46:45.469 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} diff --git a/server/router/examtestpage/grouphandle.go b/server/router/examtestpage/grouphandle.go index 6837e76..6447974 100644 --- a/server/router/examtestpage/grouphandle.go +++ b/server/router/examtestpage/grouphandle.go @@ -11,6 +11,8 @@ func (g *GroupHandleRouter) InitGroupRouter(Router *gin.RouterGroup) { shiyanCodeRouter := Router.Group("group") var authorityApi = v1.ApiGroupApp.GroupHandleApiGroup.GroupHandleApi { - shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList) // 删除回滚记录 + shiyanCodeRouter.GET("/grouplist", authorityApi.GroupList) // 获取集团架构列表 + shiyanCodeRouter.POST("/getgroupinfo", authorityApi.GetGroupInfo) // 获取集团详细信息 + shiyanCodeRouter.POST("/getgroupinfos", authorityApi.GetGroupInfos) // 获取集团详细信息 } }