herenshan112
/
hr_server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

行政组织数据对照

v1.1_dev
超级管理员 4 years ago
parent
cda0bef37e
commit
8e98fafcd2
12 changed files with 619 additions and 153 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      202206/20220602.log
  2. 80
      202206/20220603.log
  3. 38
      api/jindie_docking/dockingorganization/controller.go
  4. 5
      api/jindie_docking/dockingorganization/type.go
  5. 1
      config_server/configDatabase/database.go
  6. 13
      config_server/configDatabase/database.yaml
  7. 3
      initialization/route/route_entry.go
  8. 12
      log/202206/20220603.log
  9. 24
      log/202206/20220604.log
  10. 501
      log/20220603.log
  11. 23
      log/20220604.log
  12. 4
      scheduledtask/time_task.go

56
202206/20220602.log
View File

@ -1,56 +0,0 @@
[Trace] 2022/06/02 13:32:27 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:32:27 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:33:27 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:33:27 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:36:19 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:36:19 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:37:32 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:37:32 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:39:03 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:39:03 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:50:42 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:50:42 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:56:45 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:56:45 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:59:04 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:59:04 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 13:59:52 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 13:59:52 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:00:37 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:00:37 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:01:56 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:01:56 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:02:14 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:02:14 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:10:05 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:10:05 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:13:35 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:13:35 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:14:58 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:14:58 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:15:21 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:15:21 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:16:42 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:16:42 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:35:41 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:35:41 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:38:12 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:38:12 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:43:29 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:43:29 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 14:46:30 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 14:46:30 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 15:01:21 log.go:69: [准备启动定时任务]
[Trace] 2022/06/02 15:01:21 log.go:69: [定时任务启动成功]
[Trace] 2022/06/02 15:06:38 [准备启动定时任务]
[Trace] 2022/06/02 15:06:38 [定时任务启动成功]
[Trace] 2022/06/02 15:11:37 [准备启动定时任务]
[Trace] 2022/06/02 15:11:37 [定时任务启动成功]
[Trace] 2022/06/02 15:39:12 [准备启动定时任务]
[Trace] 2022/06/02 15:39:12 [定时任务启动成功]
[Trace] 2022/06/02 15:40:39 [准备启动定时任务]
[Trace] 2022/06/02 15:40:39 [定时任务启动成功]
[Trace] 2022/06/02 16:21:42 [准备启动定时任务]
[Trace] 2022/06/02 16:21:42 [定时任务启动成功]
[Trace] 2022/06/02 16:25:47 [准备启动定时任务]
[Trace] 2022/06/02 16:25:47 [定时任务启动成功]

80
202206/20220603.log
View File

@ -1,80 +0,0 @@
[Trace] 2022/06/03 08:23:16 [准备启动定时任务]
[Trace] 2022/06/03 08:23:16 [定时任务启动成功]
[Trace] 2022/06/03 08:27:06 [准备启动定时任务]
[Trace] 2022/06/03 08:27:06 [定时任务启动成功]
[Trace] 2022/06/03 08:28:31 [准备启动定时任务]
[Trace] 2022/06/03 08:28:31 [定时任务启动成功]
[Trace] 2022/06/03 09:30:37 [准备启动定时任务]
[Trace] 2022/06/03 09:30:37 [定时任务启动成功]
[Trace] 2022/06/03 13:26:50 [准备启动定时任务]
[Trace] 2022/06/03 13:26:50 [定时任务启动成功]
[Trace] 2022/06/03 13:45:41 [准备启动定时任务]
[Trace] 2022/06/03 13:45:41 [定时任务启动成功]
[Trace] 2022/06/03 13:54:16 [准备启动定时任务]
[Trace] 2022/06/03 13:54:16 [定时任务启动成功]
[Trace] 2022/06/03 14:03:18 [准备启动定时任务]
[Trace] 2022/06/03 14:03:18 [定时任务启动成功]
[Trace] 2022/06/03 14:10:29 [准备启动定时任务]
[Trace] 2022/06/03 14:10:29 [定时任务启动成功]
[Trace] 2022/06/03 14:13:15 [准备启动定时任务]
[Trace] 2022/06/03 14:13:15 [定时任务启动成功]
[Trace] 2022/06/03 14:15:08 [准备启动定时任务]
[Trace] 2022/06/03 14:15:08 [定时任务启动成功]
[Trace] 2022/06/03 14:18:26 [准备启动定时任务]
[Trace] 2022/06/03 14:18:26 [定时任务启动成功]
[Trace] 2022/06/03 14:19:40 [准备启动定时任务]
[Trace] 2022/06/03 14:19:40 [定时任务启动成功]
[Trace] 2022/06/03 14:21:11 [准备启动定时任务]
[Trace] 2022/06/03 14:21:11 [定时任务启动成功]
[Trace] 2022/06/03 14:22:30 [准备启动定时任务]
[Trace] 2022/06/03 14:22:30 [定时任务启动成功]
[Trace] 2022/06/03 14:23:33 [准备启动定时任务]
[Trace] 2022/06/03 14:23:33 [定时任务启动成功]
[Trace] 2022/06/03 14:25:01 [准备启动定时任务]
[Trace] 2022/06/03 14:25:01 [定时任务启动成功]
[Trace] 2022/06/03 14:37:46 [准备启动定时任务]
[Trace] 2022/06/03 14:37:46 [定时任务启动成功]
[Trace] 2022/06/03 14:40:09 [准备启动定时任务]
[Trace] 2022/06/03 14:40:09 [定时任务启动成功]
[Trace] 2022/06/03 14:41:13 [准备启动定时任务]
[Trace] 2022/06/03 14:41:13 [定时任务启动成功]
[Trace] 2022/06/03 14:41:44 [准备启动定时任务]
[Trace] 2022/06/03 14:41:44 [定时任务启动成功]
[Trace] 2022/06/03 14:49:18 [准备启动定时任务]
[Trace] 2022/06/03 14:49:18 [定时任务启动成功]
[Trace] 2022/06/03 14:52:43 [准备启动定时任务]
[Trace] 2022/06/03 14:52:43 [定时任务启动成功]
[Trace] 2022/06/03 14:57:37 [准备启动定时任务]
[Trace] 2022/06/03 14:57:37 [定时任务启动成功]
[Trace] 2022/06/03 15:01:33 [准备启动定时任务]
[Trace] 2022/06/03 15:01:33 [定时任务启动成功]
[Trace] 2022/06/03 15:05:13 [准备启动定时任务]
[Trace] 2022/06/03 15:05:13 [定时任务启动成功]
[Trace] 2022/06/03 15:05:49 [准备启动定时任务]
[Trace] 2022/06/03 15:05:49 [定时任务启动成功]
[Trace] 2022/06/03 15:07:58 [准备启动定时任务]
[Trace] 2022/06/03 15:07:58 [定时任务启动成功]
[Trace] 2022/06/03 15:08:34 [准备启动定时任务]
[Trace] 2022/06/03 15:08:34 [定时任务启动成功]
[Trace] 2022/06/03 15:09:21 [准备启动定时任务]
[Trace] 2022/06/03 15:09:21 [定时任务启动成功]
[Trace] 2022/06/03 15:10:32 [准备启动定时任务]
[Trace] 2022/06/03 15:10:32 [定时任务启动成功]
[Trace] 2022/06/03 15:12:14 [准备启动定时任务]
[Trace] 2022/06/03 15:12:14 [定时任务启动成功]
[Trace] 2022/06/03 15:13:12 [准备启动定时任务]
[Trace] 2022/06/03 15:13:12 [定时任务启动成功]
[Trace] 2022/06/03 15:13:58 [准备启动定时任务]
[Trace] 2022/06/03 15:13:58 [定时任务启动成功]
[Trace] 2022/06/03 15:20:22 [准备启动定时任务]
[Trace] 2022/06/03 15:20:22 [定时任务启动成功]
[Trace] 2022/06/03 16:00:49 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:00:49 [准备启动定时任务]
[Trace] 2022/06/03 16:00:49 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:00:49 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:00:49 [定时任务启动成功]
[Trace] 2022/06/03 16:00:49 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:01:48 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:01:48 [准备启动定时任务]
[Trace] 2022/06/03 16:01:48 -------------------------------------------------------------------------------
[Trace] 2022/06/03 16:01:48 [定时任务启动成功]

38
api/jindie_docking/dockingorganization/controller.go
View File

@ -6,6 +6,8 @@ import (
"hr_server/models"
"hr_server/overall"
"hr_server/overall/overallhandle"
"strconv"
"strings"
"time"
"github.com/gin-gonic/gin"
@ -18,10 +20,26 @@ func (d *DockingJinDieApi) DockKingdeeApi(c *gin.Context) {
// DutiesContrast()
// OrgAdmin()
Position()
// xingzheng()
outMap := overallhandle.MapOut()
overallhandle.Result(0, outMap, c)
}
func xingzheng() {
var orgList []models.AdministrativeOrganization
// orgList.GetCont(map[string]interface{}{"ispower": 1})
overall.CONSTANT_DB_HR.Where("ispower = 1").Find(&orgList)
var id []string
var num []string
for _, v := range orgList {
id = append(id, strconv.FormatInt(v.Id, 10))
num = append(num, v.Number)
}
fmt.Println(strings.Join(id, ","))
fmt.Println(strings.Join(num, ","))
}
//行政组织类型
func GetOrgType() {
var orgContAry []orgClass
@ -34,7 +52,7 @@ func GetOrgType() {
if err != nil {
overallhandle.WriteLog("e", "行政组织类型映射错误！", err)
}
overallhandle.WriteLog("i", orgContAry)
overallhandle.WriteLog("i", "行政组织类型映射成功！", orgContAry)
if len(orgContAry) < 0 {
overallhandle.WriteLog("e", "未能获取到行政组织类型！", orgContAry)
return
@ -115,7 +133,7 @@ func JobClass() {
if err != nil {
overallhandle.WriteLog("e", "职务类型映射错误！", err)
}
overallhandle.WriteLog("i", jobClassInfo)
overallhandle.WriteLog("i", "职务类型映射成功！", jobClassInfo)
if len(jobClassInfo) < 0 {
overallhandle.WriteLog("e", "未能获取到职务类型！", jobClassInfo)
return
@ -198,7 +216,7 @@ func DutiesContrast() {
if err != nil {
overallhandle.WriteLog("e", "职务映射错误！", err)
}
overallhandle.WriteLog("i", jobInfo)
overallhandle.WriteLog("i", "职务映射成功！", jobInfo)
if len(jobInfo) < 0 {
overallhandle.WriteLog("e", "未能获取到职务！", jobInfo)
return
@ -303,15 +321,15 @@ func OrgAdmin() {
sendUrl := fmt.Sprintf("%v/person/adminunit", overall.DockingKingdeeUrl)
respBody, err := GetUrl(sendUrl)
if err != nil {
overallhandle.WriteLog("e", "未能获取到职务！", err)
overallhandle.WriteLog("e", "未能获取到行政组织！", err)
}
err = json.Unmarshal(respBody, &orgInfo)
if err != nil {
overallhandle.WriteLog("e", "职务映射错误！", err)
overallhandle.WriteLog("e", "行政组织映射错误！", err)
}
overallhandle.WriteLog("i", orgInfo)
overallhandle.WriteLog("i", "行政组织映射完成！", orgInfo)
if len(orgInfo) < 0 {
overallhandle.WriteLog("e", "未能获取到职务！", orgInfo)
overallhandle.WriteLog("e", "未能获取到行政组织！", orgInfo)
return
}
var kingDeeIdAry []string
@ -387,6 +405,10 @@ func OrgAdmin() {
orgCont.WechatOrganizationId = orgOldCont.WechatOrganizationId
orgCont.Schoole = orgOldCont.Schoole
}
if overallhandle.StringIsInMap(v.Number, OrgNumberDuiZhao) {
orgCont.IsPower = 1
}
// orgCont.IsPower
addErr := overall.CONSTANT_DB_HR.Create(&orgCont).Error
if addErr == nil {
overallhandle.WriteLog("add", "行政组织写入成功！", addErr, orgCont)
@ -448,7 +470,7 @@ func Position() {
if err != nil {
overallhandle.WriteLog("e", "职位映射错误！", err)
}
overallhandle.WriteLog("i", "职位映射错误！", orgInfo)
overallhandle.WriteLog("i", "职位映射完成！", orgInfo)
if len(orgInfo) < 0 {
overallhandle.WriteLog("e", "金蝶对照数据！", orgInfo)
return

5
api/jindie_docking/dockingorganization/type.go
View File

@ -51,3 +51,8 @@ type positionType struct {
FAdminOrgUnitID string `json:"FAdminOrgUnitID"`
FParentID string `json:"FParentID"`
}
var (
OrdIdDuiZhaoAry = []int64{7, 32, 34, 40, 45, 64, 65, 91, 94, 98, 102, 104, 106, 111, 115, 116, 122, 124, 126, 128, 130, 137, 139, 140, 141, 142, 143, 144, 145, 146, 148, 149, 150, 151, 155, 156, 158, 159, 161, 166, 167, 174, 175, 176, 183, 184, 185, 186, 190, 193, 194, 195, 198, 199, 200, 201, 202, 208, 210, 211, 213, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 228, 229, 230, 231, 232, 233, 235, 236, 237, 238, 239, 240, 241, 242, 243, 249, 250, 254, 264, 267, 270, 274, 276, 279, 280, 281, 292, 293, 294, 295, 296, 297, 298, 299, 300, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 322, 323, 326, 327, 329, 330, 331, 333, 334, 335, 337, 346, 348, 353, 360, 361, 362, 363, 365, 368, 369, 371, 383, 385, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 403, 405, 407, 408}
OrgNumberDuiZhao = []string{"HXSW06", "RX15", "HXSW03", "HXSW07", "RX1702", "WL00", "RXGH00", "RX16", "RX17", "RX20", "GK03", "GK04", "GK06", "GK09", "GK1003", "GK11", "ZQ07", "HXJF03", "GK18", "HXJF06", "ZQ00", "HXJF01", "ZQ01", "ZQ12", "ZQ13", "ZQ09", "ZQ14", "ZQ16", "ZQ17", "ZQ08", "ZQ10", "ZQ11", "ZQ15", "ZQ18", "HXSW08", "GK16", "RX22", "RX23", "SGFDC01", "YLHY01", "YLHY02", "WL01", "WL02", "WL05", "WL06", "HCGJ00", "WL09", "WL12", "HCGJ01", "ZK00", "ZT09", "ZT10", "HXSW11", "WL13", "WL14", "WL15", "WL16", "GK17", "YH00", "YT00", "ZK01", "ZT00", "ZT01", "ZT02", "ZT03", "ZT04", "ZT05", "ZT06", "ZT07", "ZT08", "WL04", "WL07", "WL03", "WL08", "WL10", "WL11", "HXZY01", "HXJF00", "WL17", "ZQ02", "ZQ03", "ZQ04", "HXJF04", "ZQ06", "HXJF05", "HXZTGC00", "ZQ05", "HXJF02", "RX19", "RX21", "RX14", "RX18", "GK01", "GK02", "GK05", "GK07", "GK08", "GK10", "GK1002", "04", "HXZY00", "YLHY00", "RX00", "BY00", "HXKJ00", "HXSW", "TLWL00", "YLNY00", "HXHQ00", "TYWY00", "01", "02", "03", "HY00", "GK00", "RXDL00", "SGFDC00", "00", "HX00", "HXXCL00", "HX01", "HX0101", "HX0102", "HX02", "RX01", "RX02", "RX25", "RX03", "RX04", "RX06", "RX08", "RX10", "RX12", "HX03", "RX05", "RX07", "RX09", "RX11", "RX13", "GK12", "GK13", "GK14", "GK15", "HXSW00", "HXSW01", "HXSW10", "HXSW02", "HXSW09", "HXSW04", "HXZYRL06", "HXZYRL03", "HXLSNY00", "JAAZGC00", "HXXNY01", "HXXNY02", "HXXNY03", "HXXNY04", "HXXNY05", "HXXNY06", "HXXNY07", "HXXNY08", "HXXNY09", "HXXNY10", "HXXNY11", "HXZYRL00", "HXXNY00", "HXZYRL02", "HXZYRL05", "HXZYRL04", "HXZYRL01"}
)

1
config_server/configDatabase/database.go
View File

@ -13,6 +13,7 @@ type MysqlSetUp struct {
//其他数据库依次添加
WechatMysql MasterMysqlSetUp `mapstructure:"wechat" json:"wechat" yaml:"wechat"` //微信数据库
HrMysql MasterMysqlSetUp `mapstructure:"hrdatabase" json:"hrdatabase" yaml:"hrdatabase"` //HR数据库
HrMysqlJin MasterMysqlSetUp `mapstructure:"hrdatabasejin" json:"hrdatabasejin" yaml:"hrdatabasejin"` //HR数据库
}
type MasterMysqlSetUp struct {

13
config_server/configDatabase/database.yaml
View File

@ -28,6 +28,19 @@ wechat:
gorm_log: false #是否开启gorm日志
#HR数据库
hrdatabase:
url_path: '127.0.0.1' #数据库地址
port: 3306 #数据库端口
charset: 'utf8mb4' #数据库编码方式
parseTime: 'True' #是否自动转换时间
loc: 'Local' #时区
name: 'hr_new' #数据库名称
username: 'hr_new' #数据库用户民
password: 'AnknKiXiXaxNrw78' #数据库密码
max_idle_conns: 100 #最大空闲数量
max_open_conns: 1500 #最大打开数量
gorm_log: true #是否开启gorm日志
#HR数据库
hrdatabasejin:
url_path: '127.0.0.1' #数据库地址
port: 3306 #数据库端口
charset: 'utf8mb4' #数据库编码方式

3
initialization/route/route_entry.go
View File

@ -44,7 +44,7 @@ func InitialRouter() *gin.Engine {
{
empowerApi.InitRouterGroup(appLoadRouterGroup) //获取token
organizationApi.InitRouterGroup(appLoadRouterGroup) //组织架构
jinDieDockingApi.InitRouterGroup(appLoadRouterGroup) //金蝶对接接口
}
@ -54,6 +54,7 @@ func InitialRouter() *gin.Engine {
{
shhiyanApi.InitRouterGroup(Authentication) //实验
permitPowerApi.InitRouterGroup(Authentication) //权限相关操作
organizationApi.InitRouterGroup(appLoadRouterGroup) //组织架构
staffApi.InitRouterGroup(Authentication) //人员档案
}

12
log/202206/20220603.log
View File

File diff suppressed because one or more lines are too long

24
log/202206/20220604.log
View File

File diff suppressed because one or more lines are too long

501
log/20220603.log
View File

File diff suppressed because one or more lines are too long

23
log/20220604.log
View File

File diff suppressed because one or more lines are too long

4
scheduledtask/time_task.go
View File

@ -15,7 +15,7 @@ import (
*/
func TimeTask() {
fmt.Println("------------准备启动定时任务--------------")
overallhandle.WriteLog("t", "准备启动定时任务")
// overallhandle.WriteLog("t", "准备启动定时任务")
go func() {
c := cron.New(cron.WithSeconds()) //声明定时任务启动器
fmt.Printf("time.UTC--->%v\n", time.Now())
@ -59,6 +59,6 @@ func TimeTask() {
}()
fmt.Printf("定时任务启动成功！TIME：%v\n", overallhandle.UnixTimeToDay(time.Now().Unix(), 50))
overallhandle.WriteLog("t", "定时任务启动成功")
// overallhandle.WriteLog("t", "定时任务启动成功")
}

Write Preview
Loading…
Cancel
Save