From 86262c180edb24603ae1c9c496355554484dc1bd Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 20 Jan 2022 13:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/index/assessment/assesshandle.go      |  2 ++
 .../api/wechatapp/callback/apphandle.go       | 13 ++++++++++++
 .../api/wechatapp/callback/enter.go           |  6 ++++++
 .../api/wechatapp/callback/type.go            |  4 ++++
 gin_server_admin/api/wechatapp/enter.go       | 14 +++++++++++++
 .../api/wechatapp/sendmessage/apphandle.go    | 13 ++++++++++++
 .../api/wechatapp/sendmessage/enter.go        |  6 ++++++
 .../api/wechatapp/sendmessage/type.go         |  4 ++++
 .../api/workwechatcallback/callback/enter.go  |  2 +-
 .../workwechatcallback/callback/workwechat.go |  8 -------
 .../callback/workwechatcallback.go            | 13 ++++++++++++
 gin_server_admin/initialize/router.go         | 11 ++++++++++
 gin_server_admin/router/enter.go              |  2 ++
 gin_server_admin/router/wechatapp/callback.go | 21 +++++++++++++++++++
 gin_server_admin/router/wechatapp/enter.go    |  6 ++++++
 gin_server_admin/router/wechatapp/sendmsg.go  | 21 +++++++++++++++++++
 16 files changed, 137 insertions(+), 9 deletions(-)
 create mode 100644 gin_server_admin/api/wechatapp/callback/apphandle.go
 create mode 100644 gin_server_admin/api/wechatapp/callback/enter.go
 create mode 100644 gin_server_admin/api/wechatapp/callback/type.go
 create mode 100644 gin_server_admin/api/wechatapp/enter.go
 create mode 100644 gin_server_admin/api/wechatapp/sendmessage/apphandle.go
 create mode 100644 gin_server_admin/api/wechatapp/sendmessage/enter.go
 create mode 100644 gin_server_admin/api/wechatapp/sendmessage/type.go
 delete mode 100644 gin_server_admin/api/workwechatcallback/callback/workwechat.go
 create mode 100644 gin_server_admin/api/workwechatcallback/callback/workwechatcallback.go
 create mode 100644 gin_server_admin/router/wechatapp/callback.go
 create mode 100644 gin_server_admin/router/wechatapp/enter.go
 create mode 100644 gin_server_admin/router/wechatapp/sendmsg.go

diff --git a/gin_server_admin/api/index/assessment/assesshandle.go b/gin_server_admin/api/index/assessment/assesshandle.go
index fc8de98..77fd27e 100644
--- a/gin_server_admin/api/index/assessment/assesshandle.go
+++ b/gin_server_admin/api/index/assessment/assesshandle.go
@@ -308,6 +308,8 @@ func (a *Assessment) MyEvaluateList(c *gin.Context) {
 			return
 		}
 		gormDb = gormDb.Group("`s_depart_id`,`s_file_time`,`s_comment_user`").Having("`s_file_time` = ? AND `s_comment_user` = ?", assessmentTime, userCont.Key)
+	} else {
+		gormDb = gormDb.Group("`s_depart_id`,`s_file_time`,`s_comment_user`")
 	}
 	var total int64
 	totalErr := gormDb.Count(&total).Error
diff --git a/gin_server_admin/api/wechatapp/callback/apphandle.go b/gin_server_admin/api/wechatapp/callback/apphandle.go
new file mode 100644
index 0000000..9a4a32c
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/callback/apphandle.go
@@ -0,0 +1,13 @@
+package callback
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/commonus"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/gin-gonic/gin"
+)
+
+//入口
+func (a *CallBackApi) Index(c *gin.Context) {
+	outPut := commonus.MapOut()
+	response.Result(0, outPut, "企业微信回调入口", c)
+}
diff --git a/gin_server_admin/api/wechatapp/callback/enter.go b/gin_server_admin/api/wechatapp/callback/enter.go
new file mode 100644
index 0000000..9706954
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/callback/enter.go
@@ -0,0 +1,6 @@
+package callback
+
+//企业微信回调
+type ApiGroup struct {
+	WeChatCallBackApi CallBackApi //企业微信回调
+}
diff --git a/gin_server_admin/api/wechatapp/callback/type.go b/gin_server_admin/api/wechatapp/callback/type.go
new file mode 100644
index 0000000..637c038
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/callback/type.go
@@ -0,0 +1,4 @@
+package callback
+
+//企业微信回调
+type CallBackApi struct{}
diff --git a/gin_server_admin/api/wechatapp/enter.go b/gin_server_admin/api/wechatapp/enter.go
new file mode 100644
index 0000000..76098a4
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/enter.go
@@ -0,0 +1,14 @@
+package wechatapp
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp/sendmessage"
+	"github.com/flipped-aurora/gin-vue-admin/server/api/workwechatcallback/callback"
+)
+
+//企业微信应用
+type ApiGroup struct {
+	WorkWeChatCallBackApi callback.ApiGroup
+	WorkWeChatSendMsgApi  sendmessage.ApiGroup
+}
+
+var ApiGroupApp = new(ApiGroup)
diff --git a/gin_server_admin/api/wechatapp/sendmessage/apphandle.go b/gin_server_admin/api/wechatapp/sendmessage/apphandle.go
new file mode 100644
index 0000000..d3deb4b
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/sendmessage/apphandle.go
@@ -0,0 +1,13 @@
+package sendmessage
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/commonus"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/gin-gonic/gin"
+)
+
+//向企业微信发送消息入口
+func (s *SendMessageApi) Index(c *gin.Context) {
+	outPut := commonus.MapOut()
+	response.Result(0, outPut, "企业微信回调入口", c)
+}
diff --git a/gin_server_admin/api/wechatapp/sendmessage/enter.go b/gin_server_admin/api/wechatapp/sendmessage/enter.go
new file mode 100644
index 0000000..e750b09
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/sendmessage/enter.go
@@ -0,0 +1,6 @@
+package sendmessage
+
+//向企业微信发送信息
+type ApiGroup struct {
+	SendMsgApi SendMessageApi
+}
diff --git a/gin_server_admin/api/wechatapp/sendmessage/type.go b/gin_server_admin/api/wechatapp/sendmessage/type.go
new file mode 100644
index 0000000..8e9006f
--- /dev/null
+++ b/gin_server_admin/api/wechatapp/sendmessage/type.go
@@ -0,0 +1,4 @@
+package sendmessage
+
+//向企业微信发送信息
+type SendMessageApi struct{}
diff --git a/gin_server_admin/api/workwechatcallback/callback/enter.go b/gin_server_admin/api/workwechatcallback/callback/enter.go
index 5bed61b..ee40ee3 100644
--- a/gin_server_admin/api/workwechatcallback/callback/enter.go
+++ b/gin_server_admin/api/workwechatcallback/callback/enter.go
@@ -2,5 +2,5 @@ package callback
 
 //企业微信回调
 type ApiGroup struct {
-	WorkWeChatApi WorkWeChatCallBackApi
+	WeChatCallBackApi WorkWeChatCallBackApi
 }
diff --git a/gin_server_admin/api/workwechatcallback/callback/workwechat.go b/gin_server_admin/api/workwechatcallback/callback/workwechat.go
deleted file mode 100644
index cca24f2..0000000
--- a/gin_server_admin/api/workwechatcallback/callback/workwechat.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package callback
-
-import "github.com/gin-gonic/gin"
-
-//验证URL
-func (w *WorkWeChatCallBackApi) Index(c *gin.Context) {
-
-}
diff --git a/gin_server_admin/api/workwechatcallback/callback/workwechatcallback.go b/gin_server_admin/api/workwechatcallback/callback/workwechatcallback.go
new file mode 100644
index 0000000..6c3be38
--- /dev/null
+++ b/gin_server_admin/api/workwechatcallback/callback/workwechatcallback.go
@@ -0,0 +1,13 @@
+package callback
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/commonus"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/gin-gonic/gin"
+)
+
+//验证URL
+func (w *WorkWeChatCallBackApi) Index(c *gin.Context) {
+	outPut := commonus.MapOut()
+	response.Result(0, outPut, "企业微信回调入口", c)
+}
diff --git a/gin_server_admin/initialize/router.go b/gin_server_admin/initialize/router.go
index afafb5f..f05245f 100644
--- a/gin_server_admin/initialize/router.go
+++ b/gin_server_admin/initialize/router.go
@@ -57,6 +57,11 @@ func Routers() *gin.Engine {
 
 	staffMan := router.RouterGroupApp.StaffRouter.StaffRouter //员工相关操作
 
+	/**
+	企业微信相关
+	*/
+	workWechatApp := router.RouterGroupApp.WorkWeChatApp
+
 	/*
 		自定义管理后台
 		@adminDutyAssess 职责考核
@@ -96,6 +101,12 @@ func Routers() *gin.Engine {
 
 		staffMan.InitStaffRouter(PublicGroup) //员工相关操作
 
+		/**
+		企业微信相关
+		*/
+		workWechatApp.CallBackWeCahtApi.InitGroupRouter(PublicGroup) //企业微信回调
+		workWechatApp.SendMsgWeCahtApi.InitGroupRouter(PublicGroup)  //企业微信发送
+
 	}
 	PrivateGroup := Router.Group("")
 	PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
diff --git a/gin_server_admin/router/enter.go b/gin_server_admin/router/enter.go
index 6bb760b..cb2c506 100644
--- a/gin_server_admin/router/enter.go
+++ b/gin_server_admin/router/enter.go
@@ -12,6 +12,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/router/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/systemadmin"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/uploaddownload"
+	"github.com/flipped-aurora/gin-vue-admin/server/router/wechatapp"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/wechatcallbackrouter"
 )
 
@@ -28,6 +29,7 @@ type RouterGroup struct {
 	DutyAssEssRout   assessment.RouterGroup
 	StaffRouter      staffrouter.RouterGroup
 	AdminRouter      systemadmin.RouterGroup
+	WorkWeChatApp    wechatapp.RouterGroup
 }
 
 var RouterGroupApp = new(RouterGroup)
diff --git a/gin_server_admin/router/wechatapp/callback.go b/gin_server_admin/router/wechatapp/callback.go
new file mode 100644
index 0000000..e30cdc7
--- /dev/null
+++ b/gin_server_admin/router/wechatapp/callback.go
@@ -0,0 +1,21 @@
+package wechatapp
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp"
+	"github.com/gin-gonic/gin"
+)
+
+//企业微信回调路由
+type CallBackWeCahtApi struct{}
+
+func (g *CallBackWeCahtApi) InitGroupRouter(Router *gin.RouterGroup) {
+	groupCodeRouter := Router.Group("wechatcallback")
+	var authorityApi = wechatapp.ApiGroupApp.WorkWeChatCallBackApi.WeChatCallBackApi
+	{
+		groupCodeRouter.POST("", authorityApi.Index)
+		groupCodeRouter.POST("/", authorityApi.Index)
+		groupCodeRouter.GET("", authorityApi.Index)
+		groupCodeRouter.GET("/", authorityApi.Index)
+
+	}
+}
diff --git a/gin_server_admin/router/wechatapp/enter.go b/gin_server_admin/router/wechatapp/enter.go
new file mode 100644
index 0000000..252437a
--- /dev/null
+++ b/gin_server_admin/router/wechatapp/enter.go
@@ -0,0 +1,6 @@
+package wechatapp
+
+type RouterGroup struct {
+	CallBackWeCahtApi
+	SendMsgWeCahtApi
+}
diff --git a/gin_server_admin/router/wechatapp/sendmsg.go b/gin_server_admin/router/wechatapp/sendmsg.go
new file mode 100644
index 0000000..c2f678a
--- /dev/null
+++ b/gin_server_admin/router/wechatapp/sendmsg.go
@@ -0,0 +1,21 @@
+package wechatapp
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/api/wechatapp"
+	"github.com/gin-gonic/gin"
+)
+
+//向企业微信发送信息路由
+type SendMsgWeCahtApi struct{}
+
+func (g *SendMsgWeCahtApi) InitGroupRouter(Router *gin.RouterGroup) {
+	groupCodeRouter := Router.Group("wechatsendmsg")
+	var authorityApi = wechatapp.ApiGroupApp.WorkWeChatSendMsgApi.SendMsgApi
+	{
+		groupCodeRouter.POST("", authorityApi.Index)
+		groupCodeRouter.POST("/", authorityApi.Index)
+		groupCodeRouter.GET("", authorityApi.Index)
+		groupCodeRouter.GET("/", authorityApi.Index)
+
+	}
+}