From e1a955b09cd0aec81e6ca159cf498a440fdfa519 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 22 Jan 2026 14:31:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AF=86=E4=BC=A0=E8=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/authentication/creatToke.go | 17 +- api/authentication/setupRoule.go | 45 ++- api/authentication/signcode.go | 16 +- api/personalityTest/rongXinPage/controller.go | 98 +++++- api/personalityTest/rongXinPage/downLoad.go | 15 +- api/version1/customChartesing/formTable.go | 91 +++++- api/version1/customerApp/appControll.go | 298 ++++++++++++++++-- api/version1/customerApp/commont.go | 13 +- api/version1/customerApp/companyduty.go | 135 +++++++- api/version1/customerApp/runAppControll.go | 93 +++++- api/version1/dataCenter/hander.go | 27 +- api/version1/dataCenter/runDataBase.go | 15 +- .../datamanagement/redisController/redis.go | 34 +- api/version1/dict/dictionary.go | 113 ++++++- api/version1/grantpowers/appMenuPower.go | 67 +++- api/version1/grantpowers/myAppPower.go | 13 +- api/version1/grantpowers/postpower.go | 107 ++++++- api/version1/humanResources/org.go | 18 +- api/version1/humanResources/peopel.go | 43 ++- api/version1/matrixApi/api.go | 125 +++++++- api/version1/menus/menus.go | 85 ++++- api/version1/menus/workTems.go | 78 ++++- api/version1/newsclass/newsapi.go | 74 ++++- api/version1/publicapi/api.go | 113 ++++++- api/version1/setupRoule/authorization.go | 15 +- api/version1/setupRoule/orgPeople.go | 76 ++++- api/version1/setupRoule/power.go | 35 +- .../taskplatform/matsFormula/formula.go | 31 +- .../taskplatform/taskflowing/analyFormJson.go | 13 +- .../taskplatform/taskflowing/appTaskFlow.go | 29 +- .../taskplatform/taskflowing/editformflow.go | 68 +++- .../taskplatform/taskflowing/flowengine.go | 75 ++++- .../taskplatform/taskflowing/runflow.go | 49 ++- .../taskplatform/taskflowing/taskFlow.go | 82 ++++- .../taskplatform/taskflowing/workFlowRun.go | 16 +- .../taskplatform/taskflowing/workflow.go | 123 +++++++- .../taskplatform/taskmanagement/appform.go | 68 +++- .../taskmanagement/formcontrol.go | 18 +- .../taskplatform/taskmanagement/ruanTask.go | 80 ++++- .../taskmanagement/runTaskFlow.go | 43 ++- .../taskmanagement/runWorkFlow.go | 86 ++++- api/version1/user/setPower.go | 5 +- api/version1/user/userCont.go | 121 ++++++- api/version1/workFlowRun/flow.go | 28 +- api/version1/workWechat/sendMsg.go | 14 +- api/version1/workWechat/wechat.go | 14 +- config/configApp/appConfig.yaml | 3 + config/configApp/server.go | 3 + overall/publicmethod/formatOutput.go | 51 ++- overall/publicmethod/newSm4.go | 129 ++++++++ overall/publicmethod/randString.go | 43 +++ overall/publicmethod/sm4.go | 4 +- overall/publicmethod/type.go | 10 + 53 files changed, 2791 insertions(+), 274 deletions(-) create mode 100644 overall/publicmethod/newSm4.go create mode 100644 overall/publicmethod/randString.go diff --git a/api/authentication/creatToke.go b/api/authentication/creatToke.go index 1f577e1..aa16975 100644 --- a/api/authentication/creatToke.go +++ b/api/authentication/creatToke.go @@ -6,6 +6,7 @@ import ( "appPlatform/models/modelsschool" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "github.com/gin-gonic/gin" @@ -18,12 +19,24 @@ import ( @ 功能: 获取身份 */ func (a *ApiMethod) HaveMyCode(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c) + publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(200, err, c, "未知行政组织！") return diff --git a/api/authentication/setupRoule.go b/api/authentication/setupRoule.go index 9d3c670..289b050 100644 --- a/api/authentication/setupRoule.go +++ b/api/authentication/setupRoule.go @@ -5,6 +5,7 @@ import ( "appPlatform/models/modelssystempermission" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "sort" "strconv" @@ -76,12 +77,23 @@ func (a *RoleApiMethod) GiveRoleGroupTree(c *gin.Context) { // 编辑角色组 func (a *RoleApiMethod) EditRoleCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var request EditInfoRole - err := c.ShouldBindJSON(&request) + err = json.Unmarshal(dataVal, &request) if err != nil { - publicmethod.Result(1, err, c) + publicmethod.Result(100, err, c) return } + // var request EditInfoRole + // err := c.ShouldBindJSON(&request) + // if err != nil { + // publicmethod.Result(1, err, c) + // return + // } roleType := 2 if request.Types == "" { roleType = 2 @@ -168,12 +180,24 @@ func AddRoleCont(saveData EditInfoRole) (err error) { @ 功能: 修改角色状态 */ func (a *RoleApiMethod) EditRoleStatus(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var request EditRoleState - err := c.ShouldBindJSON(&request) + err = json.Unmarshal(dataVal, &request) if err != nil { - publicmethod.Result(1, err, c) + publicmethod.Result(100, err, c) return } + + // var request EditRoleState + // err := c.ShouldBindJSON(&request) + // if err != nil { + // publicmethod.Result(1, err, c) + // return + // } if request.Id == "" { publicmethod.Result(1, err, c, "未知角色！") return @@ -222,8 +246,19 @@ func (g *GetAllSunId) GaveMySunAll(parentId int64) { // 获取行政组织加岗位树 func (a *RoleApiMethod) GetOrgPostTree(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var request publicmethod.PublicId - c.ShouldBindJSON(&request) + err = json.Unmarshal(dataVal, &request) + if err != nil { + publicmethod.Result(100, err, c) + return + } + // var request publicmethod.PublicId + // c.ShouldBindJSON(&request) var orgId int64 var sunOrgList publicmethod.GetOrgAllParent if request.Id != "" { diff --git a/api/authentication/signcode.go b/api/authentication/signcode.go index a6a643b..0fe7c3b 100644 --- a/api/authentication/signcode.go +++ b/api/authentication/signcode.go @@ -4,6 +4,7 @@ import ( "appPlatform/middleware/grocerystore" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "github.com/gin-gonic/gin" @@ -17,12 +18,25 @@ func (a *ApiMethod) SignCode(c *gin.Context) { publicmethod.Result(1, userKey, c, "验证失败！未知识别符！") return } + + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SignCodeStr - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SignCodeStr + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Code == "" { publicmethod.Result(1, err, c, "验证失败！未知识别符！") return diff --git a/api/personalityTest/rongXinPage/controller.go b/api/personalityTest/rongXinPage/controller.go index 6e93c35..ffcb341 100644 --- a/api/personalityTest/rongXinPage/controller.go +++ b/api/personalityTest/rongXinPage/controller.go @@ -32,12 +32,24 @@ import ( # */ func (a *ApiMethod) Login(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData PersonalityTestIn - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, requestData, c) + publicmethod.Result(100, err, c) return } + + // var requestData PersonalityTestIn + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, requestData, c) + // return + // } if requestData.Number == "" { publicmethod.Result(1, err, c, "请输入工号！") return @@ -90,12 +102,24 @@ func (a *ApiMethod) Login(c *gin.Context) { # */ func (a *ApiMethod) LoginExternal(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData PersonalityTestOut - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData PersonalityTestOut + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Tel == "" { publicmethod.Result(1, err, c, "请输入联系电话！") return @@ -210,8 +234,21 @@ func (a *ApiMethod) SubmitDataRongXin(c *gin.Context) { return } } + + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData JieShouDaan - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData JieShouDaan + // c.ShouldBindJSON(&requestData) if len(requestData.List) < 1 { publicmethod.Result(1, requestData, c, "您未填写任何题目！不可提交") return @@ -377,12 +414,23 @@ func (a *ApiMethod) DoesItExist(c *gin.Context) { # */ func (a *ApiMethod) GetUserDISCTest(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知信息！请检查是否已经登录！") return @@ -735,8 +783,19 @@ func (a *ApiMethod) SubmitTestPageAnswer(c *gin.Context) { publicmethod.Result(302, err, c, "您的身份令牌已经失效！请重新登录！") return } + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData JieShouDaaning - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData JieShouDaaning + // c.ShouldBindJSON(&requestData) if myCont.Number != "" { var userCont modelshr.PersonArchives err = userCont.GetCont(map[string]interface{}{"`number`": myCont.Number}, "`id`") @@ -835,8 +894,19 @@ func (a *ApiMethod) NineResult(c *gin.Context) { publicmethod.Result(302, err, c, "您的身份令牌已经失效！请重新登录！") return } + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData publicmethod.PublicId + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { requestData.Id = "10000003" } @@ -1021,12 +1091,24 @@ func (a *ApiMethod) NineResult(c *gin.Context) { @ 功能: */ func (a *ApiMethod) NineResultToken(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知信息！请检查是否已经登录！") return diff --git a/api/personalityTest/rongXinPage/downLoad.go b/api/personalityTest/rongXinPage/downLoad.go index 697ae88..24aee83 100644 --- a/api/personalityTest/rongXinPage/downLoad.go +++ b/api/personalityTest/rongXinPage/downLoad.go @@ -308,8 +308,19 @@ func CalculateScoresForEachItem(testPage JieShouDaaning) (ScoreForEachItem []Cha # */ func (a *ApiMethod) StatisticsPersonality(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData CharacterStatis - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData CharacterStatis + // c.ShouldBindJSON(&requestData) if requestData.Typekey == "" { requestData.Typekey = "10000001" } @@ -342,7 +353,7 @@ func (a *ApiMethod) StatisticsPersonality(c *gin.Context) { goormDb = goormDb.Where("`admin_org` IN ?", sunOrg.Id) } } - err := goormDb.Find(&peopleList).Error + err = goormDb.Find(&peopleList).Error if err != nil || len(peopleList) < 1 { c.String(c.Writer.Status(), "没有查询到数据") return diff --git a/api/version1/customChartesing/formTable.go b/api/version1/customChartesing/formTable.go index aab7047..db3f2b2 100644 --- a/api/version1/customChartesing/formTable.go +++ b/api/version1/customChartesing/formTable.go @@ -36,12 +36,23 @@ import ( # */ func (a *ApiMethod) DimMeaFormTable(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c, "数据参数错误！") + publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c, "数据参数错误！") + // return + // } var custTable modelAppPlatform.CustomerFormView err = overall.CONSTANT_DB_AppPlatform.Model(&custTable).Select("`mastesformjson`,`table_structure`,`cfid`,`name`,`groupid`,`listjson`,`signCode`").Where("`status` = 1 AND `classify` <> 3 AND `tablekey` = ?", requestData.Id).First(&custTable).Error if err != nil { @@ -172,9 +183,20 @@ func (a *ApiMethod) DimMeaFormTable(c *gin.Context) { @ 功能: 将图表信息写入数据库 */ func (a *ApiMethod) CountChartValue(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SaveChartSetup - err := c.ShouldBindJSON(&requestData) - fmt.Printf("\n\n========>%v\n\n", err) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) + return + } + // var requestData SaveChartSetup + // err := c.ShouldBindJSON(&requestData) + // fmt.Printf("\n\n========>%v\n\n", err) if requestData.TableKey == "" { publicmethod.Result(1, requestData, c, "未知数据源表！") return @@ -210,12 +232,23 @@ func (a *ApiMethod) CountChartValue(c *gin.Context) { @ 功能: 获取图表设定信息 */ func (a *ApiMethod) GetChartCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c, "数据参数错误！") + publicmethod.Result(100, err, c) return } + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c, "数据参数错误！") + // return + // } if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知数据源表！2") return @@ -242,12 +275,23 @@ func (a *ApiMethod) GetChartCont(c *gin.Context) { @ 功能: 根据条件解析图标结果 */ func (a *ApiMethod) AnalyzeChartData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData OneChartViews - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c, "数据参数错误！") + publicmethod.Result(200, err, c) return } + // var requestData OneChartViews + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c, "数据参数错误！") + // return + // } if requestData.TableKey == "" { publicmethod.Result(1, requestData, c, "未知数据源表！") return @@ -617,12 +661,23 @@ func Dengshi(t int, field, val string) (sqlStr string) { @ 功能: 初始化个人图表配置及数据 */ func (a *ApiMethod) GetMyChartSetupAndData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c, "数据参数错误！") + publicmethod.Result(100, err, c) return } + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c, "数据参数错误！") + // return + // } if requestData.Id == "" { publicmethod.Result(200, err, c, "未知表单，不可操作！") return @@ -662,12 +717,24 @@ func (a *ApiMethod) GetMyChartSetupAndData(c *gin.Context) { @ 功能: 保存跟人图表设置 */ func (a *ApiMethod) SaveMyBiCharts(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SaveChartSetup - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(1, err, c) + publicmethod.Result(100, err, c) return } + + // var requestData SaveChartSetup + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(1, err, c) + // return + // } if requestData.TableKey == "" { publicmethod.Result(1, requestData, c, "未知数据源表！") return diff --git a/api/version1/customerApp/appControll.go b/api/version1/customerApp/appControll.go index d408657..1ff6992 100644 --- a/api/version1/customerApp/appControll.go +++ b/api/version1/customerApp/appControll.go @@ -37,12 +37,23 @@ import ( # */ func (a *ApiMethod) CreateApp(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -269,12 +280,23 @@ func gainMenuIcon(id int64) (img string) { # */ func (a *ApiMethod) GainAppEditPsge(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -394,12 +416,23 @@ func GainAppMenuTree(key int64, menuPower publicmethod.SendAppTabelPower) (menus # */ func (a *ApiMethod) GinOthenMenuTree(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -467,12 +500,23 @@ func GainAppMenuOtherTree(key int64) (menusTree []AppMenuTree) { # */ func (a *ApiMethod) SaveAppMenu(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppMenuInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AppMenuInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Name == "" { publicmethod.Result(102, err, c) return @@ -561,12 +605,23 @@ func (a *ApiMethod) SaveAppMenu(c *gin.Context) { # */ func (a *ApiMethod) GainAllAppMenu(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -617,12 +672,24 @@ func (a *ApiMethod) GainAllAppMenu(c *gin.Context) { # */ func (a *ApiMethod) EditAppMenuCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppMenuTreeSave - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AppMenuTreeSave + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -673,12 +740,23 @@ func DiGuiAppMenuEdit(prientKey string, menuTree []AppMenuTree) { # */ func (a *ApiMethod) EditAppMenuLable(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditAppMenuNAme - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditAppMenuNAme + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -764,12 +842,23 @@ func EditAppMenuFormName(signCode int64, title string) { # */ func (a *ApiMethod) AppMenuShowOrHide(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData HideOrShowAppMenu - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData HideOrShowAppMenu + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Types == 0 { requestData.Types = 1 } @@ -843,12 +932,23 @@ func (a *ApiMethod) AppMenuShowOrHide(c *gin.Context) { # */ func (a *ApiMethod) DelAppMenu(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicStates - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicStates + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -909,12 +1009,24 @@ func (a *ApiMethod) DelAppMenu(c *gin.Context) { # */ func (a *ApiMethod) CreateAppForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddAppFormPageInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AddAppFormPageInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.AppKey == "" { publicmethod.Result(1, err, c, "未知应用！不可添加") return @@ -1068,12 +1180,23 @@ func (a *ApiMethod) CreateAppForm(c *gin.Context) { # */ func (a *ApiMethod) SaveOtherVersion(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddAppFormPageInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AddAppFormPageInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.AppKey == "" { publicmethod.Result(1, err, c, "未知应用！不可添加") return @@ -1207,12 +1330,24 @@ func (a *ApiMethod) SaveOtherVersion(c *gin.Context) { # */ func (a *ApiMethod) EditAppPageInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditAppFormPageInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData EditAppFormPageInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.AppKey == "" { publicmethod.Result(1, err, c, "未知应用！不可添加") return @@ -1536,12 +1671,24 @@ func SaveAppFormMenu(menuId, appkey, parent, creater, cureeTime int64, class int # */ func (a *ApiMethod) GainAppPageInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -1754,12 +1901,24 @@ func (n *NodePublicInfo) BianLiShiyongWork(wordKey []string) []string { # */ func (a *ApiMethod) PreviewAppFormVersion(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -1820,12 +1979,24 @@ func (a *ApiMethod) PreviewAppFormVersion(c *gin.Context) { # */ func (a *ApiMethod) AppBasicSettings(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppSetupInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AppSetupInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -1884,12 +2055,24 @@ func (a *ApiMethod) AppBasicSettings(c *gin.Context) { # */ func (a *ApiMethod) SetLookViews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SetAppLookViews - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SetAppLookViews + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -1957,12 +2140,24 @@ func (a *ApiMethod) SetLookViews(c *gin.Context) { # */ func (a *ApiMethod) SetAppManagerInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SetAppLookViews - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SetAppLookViews + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -2030,12 +2225,23 @@ func (a *ApiMethod) SetAppManagerInfo(c *gin.Context) { # */ func (a *ApiMethod) GainLookViews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -2232,12 +2438,24 @@ func (c *CallBackAppOrgRoleUs) GainAppOrgList(val string, class int) { # */ func (a *ApiMethod) GianAppFormTable(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SearchAppTable - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SearchAppTable + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -2298,8 +2516,19 @@ func (a *ApiMethod) GianAppFormTable(c *gin.Context) { # */ func (a *ApiMethod) SetCustomerFormState(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicState - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData publicmethod.PublicState + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(102, requestData, c) @@ -2312,7 +2541,7 @@ func (a *ApiMethod) SetCustomerFormState(c *gin.Context) { requestData.IsTrue = 1 } var custFormInfo modelAppPlatform.CustomerForm - err := custFormInfo.GetCont(map[string]interface{}{"`signCode`": requestData.Id}, "`id`", "`states`") + err = custFormInfo.GetCont(map[string]interface{}{"`signCode`": requestData.Id}, "`id`", "`states`") if err != nil { publicmethod.Result(107, err, c) return @@ -2346,12 +2575,23 @@ func (a *ApiMethod) SetCustomerFormState(c *gin.Context) { # */ func (a *ApiMethod) EditAppMenusIcon(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditAppMenuNAme - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditAppMenuNAme + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -2523,12 +2763,24 @@ func GainAppTree(key int64) (menusTree []AppMenuTree) { # */ func (a *ApiMethod) MoveAppMenus(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData MoveAppMenusId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData MoveAppMenusId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.MenuId == "" || requestData.OldMenuId == "" { publicmethod.Result(102, err, c) return diff --git a/api/version1/customerApp/commont.go b/api/version1/customerApp/commont.go index daefb37..7aeeeea 100644 --- a/api/version1/customerApp/commont.go +++ b/api/version1/customerApp/commont.go @@ -325,12 +325,23 @@ func ParseExcelCsvData(row [][]string, orgList []string, types int, orgIdInt, cu @ 功能: 将排班信息解写入数据库 */ func (a *ApiMethod) AnalysisDutyData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AlaDutyInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AlaDutyInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrgId == 0 { publicmethod.Result(200, err, c, "未知行政组织！非法数据据") return diff --git a/api/version1/customerApp/companyduty.go b/api/version1/customerApp/companyduty.go index 83003cd..6fbe08e 100644 --- a/api/version1/customerApp/companyduty.go +++ b/api/version1/customerApp/companyduty.go @@ -122,12 +122,24 @@ func SearchRoleLevev(roles string) (level int) { @ 功能: 获取根据年月获取排班目录表 */ func (a *ApiMethod) GetYearMonthWorkMan(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData PaiBanInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData PaiBanInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrgId == 0 { publicmethod.Result(1, err, c, "未知行政组织！") return @@ -283,12 +295,24 @@ func GetMAnInfo(userKey string, yearValInt, monthValInt, dayValInt int) (userLis // 根据行政组织获取人员信息 func (a *ApiMethod) GeiOrgAllPeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GetOrgPeopel - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData GetOrgPeopel + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrgId == 0 { publicmethod.Result(1, err, c, "未知行政组织！") return @@ -335,12 +359,23 @@ func (a *ApiMethod) GeiOrgAllPeople(c *gin.Context) { @ 功能: 编辑值班信息 */ func (a *ApiMethod) SaveEditDutyInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DutyOrgInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData DutyOrgInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Orgid == 0 { publicmethod.Result(1, err, c, "未知行政组织！") return @@ -415,12 +450,23 @@ func (a *ApiMethod) SaveEditDutyInfo(c *gin.Context) { // 根据日期获取行政组织排班列表 func (a *ApiMethod) GeyOneDayDuty(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData OenDayDuty - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData OenDayDuty + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrgId == 0 { publicmethod.Result(1, err, c, "未知行政组织！") return @@ -509,12 +555,24 @@ func (a *ApiMethod) GeyOneDayDuty(c *gin.Context) { @ 功能: 清空日期值班 */ func (a *ApiMethod) DelOneDayDuty(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[int64] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[int64] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == 0 { publicmethod.Result(1, err, c, "未知删除项目！") return @@ -531,12 +589,23 @@ func (a *ApiMethod) DelOneDayDuty(c *gin.Context) { @ 功能: 获取排版信息 */ func (a *ApiMethod) GetDutyCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知项目！") return @@ -635,8 +704,19 @@ func HaveUSerInfo(userKey []string) (manAry []SendOrgPeopelList) { # */ func (a *ApiMethod) GetOrgAndEveryOnePeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData OrgAndMAnThreeType - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData OrgAndMAnThreeType + // c.ShouldBindJSON(&requestData) redisKey := fmt.Sprintf("Auth:Org_%v_Info", requestData.Id) if requestData.Id == "" { redisKey = fmt.Sprintf("Auth:Org_%v_Info", "orgAll") @@ -857,12 +937,24 @@ func (e *empowerSync) GetOrgList(isNotIn int, orgId []int64, level int) { // 获取行政组织树 func (a *ApiMethod) GetOrgTree(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[int64] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[int64] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } var origin int64 var orgIdList []int64 isNotIn := 0 @@ -933,8 +1025,19 @@ func GovOrgTree(parentId int64, govList []JianLueOrgTree) (govMap []JianLueOrgTr @ 功能: 获取人员信息 */ func (a *ApiMethod) GetOrgPeopleList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData OrgPeopinCenter - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData OrgPeopinCenter + // c.ShouldBindJSON(&requestData) fmt.Printf("翻页数据--->%v\n\n", requestData) if requestData.Page == 0 { requestData.Page = 1 @@ -996,12 +1099,24 @@ func (a *ApiMethod) GetOrgPeopleList(c *gin.Context) { @ 功能: 日历表单一删除值班人 */ func (a *ApiMethod) DelMonthOneus(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DelOneUsRili - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData DelOneUsRili + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == 0 { publicmethod.Result(1, err, c, "未知删除对象！") return diff --git a/api/version1/customerApp/runAppControll.go b/api/version1/customerApp/runAppControll.go index 60e3da9..e0b9324 100644 --- a/api/version1/customerApp/runAppControll.go +++ b/api/version1/customerApp/runAppControll.go @@ -36,12 +36,23 @@ import ( # */ func (a *ApiMethod) AppJwtPower(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData JwtPower - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData JwtPower + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -251,8 +262,19 @@ func (t *TreeJwtPower) JwtRoleViewsIsTrue(jwpRoel, userRole string) { # */ func (a *ApiMethod) GetAllAppTableForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppForm - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GainAppForm + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(102, requestData, c) return @@ -330,12 +352,23 @@ func (a *ApiMethod) GetAllAppTableForm(c *gin.Context) { # */ func (a *ApiMethod) CalculateQuantityOption(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppIdType - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AppIdType + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -453,12 +486,23 @@ func (s *StatisTaskCount) GetTotalPAge(appk string, types int) { # */ func (a *ApiMethod) GetAppList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(102, err, c) return @@ -562,8 +606,19 @@ func (x *XiechengApp) GainAppList(id int64) { # */ func (a *ApiMethod) GainMenuGroupForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppIdType - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AppIdType + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(1021, requestData, c) return @@ -575,7 +630,7 @@ func (a *ApiMethod) GainMenuGroupForm(c *gin.Context) { } else { gormDb = gormDb.Where("`pcIsShow` = ?", 1) } - err := gormDb.Order("`sort` DESC").Find(&topIdAry).Error + err = gormDb.Order("`sort` DESC").Find(&topIdAry).Error if err != nil || len(topIdAry) < 1 { publicmethod.Result(10001, topIdAry, c) return @@ -716,12 +771,23 @@ func (a *AppMenuList) AppMenuContent(appKey int64, menuInfo modelAppPlatform.App # */ func (a *ApiMethod) GainDataStorceAllField(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DatabaseConfig - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData DatabaseConfig + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(200, err, c) return @@ -883,8 +949,19 @@ func (a *ApiMethod) GinTeamRule(c *gin.Context) { # */ func (a *ApiMethod) SetupRulerForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData TableFormDnsConfig - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData TableFormDnsConfig + // c.ShouldBindJSON(&requestData) overall.CONSTANT_DB_AppPlatform.Exec("TRUNCATE diaoBanSetup") var diaoIno customerForm.DiaoBanSetup diaoIno.Appid, _ = strconv.ParseInt(requestData.AppId, 10, 64) //归属哪个app"` diff --git a/api/version1/dataCenter/hander.go b/api/version1/dataCenter/hander.go index 3516324..81a5d76 100644 --- a/api/version1/dataCenter/hander.go +++ b/api/version1/dataCenter/hander.go @@ -28,8 +28,20 @@ import ( # */ func (a *ApiMethod) GaindataCenter(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DataInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData DataInfo + // c.ShouldBindJSON(&requestData) if requestData.Url == "" { publicmethod.Result(1, requestData, c, "未知访问地址") return @@ -157,8 +169,19 @@ func (a *ApiMethod) GaindataCenter(c *gin.Context) { # */ func (a *ApiMethod) PostSaveData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DataInfoPost - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData DataInfoPost + // c.ShouldBindJSON(&requestData) if requestData.Url == "" { publicmethod.Result(1, requestData, c, "未知访问地址") return diff --git a/api/version1/dataCenter/runDataBase.go b/api/version1/dataCenter/runDataBase.go index 5bc72b0..27ef601 100644 --- a/api/version1/dataCenter/runDataBase.go +++ b/api/version1/dataCenter/runDataBase.go @@ -3,6 +3,7 @@ package datacenter import ( "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "github.com/gin-gonic/gin" @@ -26,12 +27,24 @@ import ( # */ func (a *ApiMethod) GainDataTable(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DataBastType - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData DataBastType + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Type == "" { publicmethod.Result(1, err, c, "未知数据库类型！请先确实是什么数据库类型！") return diff --git a/api/version1/datamanagement/redisController/redis.go b/api/version1/datamanagement/redisController/redis.go index 44251c5..547bb2c 100644 --- a/api/version1/datamanagement/redisController/redis.go +++ b/api/version1/datamanagement/redisController/redis.go @@ -3,6 +3,7 @@ package redisController import ( "appPlatform/overall/publicmethod" "context" + "encoding/json" "fmt" "sort" @@ -28,12 +29,24 @@ import ( # */ func (a *ApiMethod) TestRedisLink(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var redisConfig RedisConfig - err := c.ShouldBindJSON(&redisConfig) + err = json.Unmarshal(dataVal, &redisConfig) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + + // var redisConfig RedisConfig + // err := c.ShouldBindJSON(&redisConfig) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if redisConfig.Ip == "" { redisConfig.Ip = "127.0.0.1" } @@ -223,13 +236,24 @@ func (r *RunOneRedis) OpenRedis() (redisDb *redis.Client) { # */ func (a *ApiMethod) MoveOldRedisToNewRedis(c *gin.Context) { - // var callBalackMsg MoveRedisMsg + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData MoveRedis - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var callBalackMsg MoveRedisMsg + // var requestData MoveRedis + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.OriginRedis.State != 1 || requestData.TargetRedis.State != 1 { publicmethod.Result(10001, err, c, "请先测试源Redis与目标Redis是否链接成功！") return diff --git a/api/version1/dict/dictionary.go b/api/version1/dict/dictionary.go index cda72f6..760d76d 100644 --- a/api/version1/dict/dictionary.go +++ b/api/version1/dict/dictionary.go @@ -4,6 +4,7 @@ import ( "appPlatform/models/modelAppPlatform" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "strconv" "time" @@ -28,8 +29,19 @@ import ( # */ func (a *ApiMethod) DictTypeList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DictType - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData DictType + // c.ShouldBindJSON(&requestData) if requestData.Page == 0 { requestData.Page = 1 } @@ -47,7 +59,7 @@ func (a *ApiMethod) DictTypeList(c *gin.Context) { total = 0 } gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Find(&dictListCont).Error + err = gormDb.Find(&dictListCont).Error if err != nil && len(dictListCont) < 1 { publicmethod.Result(105, err, c) return @@ -86,12 +98,23 @@ func (a *ApiMethod) DictTypeList(c *gin.Context) { # */ func (a *ApiMethod) AddDictType(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddNewDictType - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AddNewDictType + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Name == "" { publicmethod.Result(1, err, c, "请输入字典类型名称！") return @@ -168,8 +191,19 @@ func (a *ApiMethod) GetDictTypeCont(c *gin.Context) { # */ func (a *ApiMethod) EditDictCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditDictTypeInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData EditDictTypeInfo + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知字典类型！") return @@ -184,7 +218,7 @@ func (a *ApiMethod) EditDictCont(c *gin.Context) { whery := publicmethod.MapOut[string]() whery["`id`"] = requestData.Id var dictTypeOldCont modelAppPlatform.DictType - err := dictTypeOldCont.GetCont(whery) + err = dictTypeOldCont.GetCont(whery) if err != nil { publicmethod.Result(107, err, c) return @@ -245,12 +279,23 @@ func EditDictContStatus(typeId, status int) { # */ func (a *ApiMethod) DelDictTypeCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DelDictTypeInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData DelDictTypeInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if len(requestData.Id) < 1 { publicmethod.Result(101, err, c) return @@ -291,8 +336,19 @@ func (a *ApiMethod) DelDictTypeCont(c *gin.Context) { # */ func (a *ApiMethod) GetDictionary(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DictionaryList - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData DictionaryList + // c.ShouldBindJSON(&requestData) if requestData.CodeType == "" { publicmethod.Result(1, requestData, c, "未知字典类型") return @@ -314,7 +370,7 @@ func (a *ApiMethod) GetDictionary(c *gin.Context) { total = 0 } gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Order("`sort` ASC").Find(&dictionaryContList).Error + err = gormDb.Order("`sort` ASC").Find(&dictionaryContList).Error if err != nil && len(dictionaryContList) < 1 { publicmethod.Result(105, err, c) return @@ -354,8 +410,19 @@ func (a *ApiMethod) GetDictionary(c *gin.Context) { # */ func (a *ApiMethod) AddDictionaryCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddNewDictionaryCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AddNewDictionaryCont + // c.ShouldBindJSON(&requestData) if requestData.TypeCode == "" { publicmethod.Result(1, requestData, c, "未知字典类型") return @@ -447,8 +514,19 @@ func (a *ApiMethod) GetDictionaryCont(c *gin.Context) { # */ func (a *ApiMethod) EditDictionaryCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditNewDictionaryCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData EditNewDictionaryCont + // c.ShouldBindJSON(&requestData) if requestData.Id == 0 { publicmethod.Result(1, requestData.Id, c, "未知字典内容！") return @@ -466,7 +544,7 @@ func (a *ApiMethod) EditDictionaryCont(c *gin.Context) { whery := publicmethod.MapOut[string]() whery["`id`"] = requestData.Id var oldDictCont modelAppPlatform.Dictionary - err := oldDictCont.GetCont(whery) + err = oldDictCont.GetCont(whery) if err != nil { publicmethod.Result(107, err, c) return @@ -520,12 +598,23 @@ func (a *ApiMethod) EditDictionaryCont(c *gin.Context) { # */ func (a *ApiMethod) DelDictionaryCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData DelDictTypeInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData DelDictTypeInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if len(requestData.Id) < 1 { publicmethod.Result(101, err, c) return diff --git a/api/version1/grantpowers/appMenuPower.go b/api/version1/grantpowers/appMenuPower.go index ff8566b..fe0b91d 100644 --- a/api/version1/grantpowers/appMenuPower.go +++ b/api/version1/grantpowers/appMenuPower.go @@ -22,12 +22,23 @@ import ( @ 功能: 初始化App双轴选项卡 */ func (a *ApiMethod) GetAppGroupo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppConfig - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AppConfig + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知配权系统！不可进行配权") return @@ -181,8 +192,19 @@ func GainAppGroupAuth(powerType, systemKey string) (butAry, groupAry []string) { @ 功能: 根据分组获取App列表 */ func (a *ApiMethod) GetGroupAppList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GetGroupAppList - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GetGroupAppList + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知配权系统！不可进行配权") return @@ -243,8 +265,19 @@ func GetGroupAppListIng(uuId, powerType, appType, powerId string) (appAry []AppI @ 功能: 获取app菜单 */ func (a *ApiMethod) GetAppMenuList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GetGroupAppList - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GetGroupAppList + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知配权系统！不可进行配权") return @@ -260,7 +293,7 @@ func (a *ApiMethod) GetAppMenuList(c *gin.Context) { } var menuList []modelAppPlatform.Appmenus - err := overall.CONSTANT_DB_AppPlatform.Where("`state` = 1 AND `isLock` = 2 AND `appkey` = ?", requestData.AppId).Find(&menuList).Error + err = overall.CONSTANT_DB_AppPlatform.Where("`state` = 1 AND `isLock` = 2 AND `appkey` = ?", requestData.AppId).Find(&menuList).Error if err != nil { return } @@ -382,8 +415,19 @@ func AppTreeMenusnOne(parentId int64, menuList []modelAppPlatform.Appmenus) (men @ 功能: 分组授权 */ func (a *ApiMethod) AppGroupPowerConfig(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData ConfigSetupGroup - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData ConfigSetupGroup + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知配权系统！不可进行配权") return @@ -430,8 +474,19 @@ func (a *ApiMethod) AppGroupPowerConfig(c *gin.Context) { @ 功能: 写入App及相关菜单权限 */ func (a *ApiMethod) AppPowerConfig(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppMenuPower - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AppMenuPower + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知配权系统！不可进行配权") return diff --git a/api/version1/grantpowers/myAppPower.go b/api/version1/grantpowers/myAppPower.go index 62fdeae..30bf82b 100644 --- a/api/version1/grantpowers/myAppPower.go +++ b/api/version1/grantpowers/myAppPower.go @@ -18,12 +18,23 @@ import ( @ 功能: 处理自定义应用授权数据 */ func (a *ApiMethod) GainAppEmpowerPower(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppIdAndRoleNew - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData GainAppIdAndRoleNew + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知App！不可获取表单列表！") return diff --git a/api/version1/grantpowers/postpower.go b/api/version1/grantpowers/postpower.go index 12e0f71..7c26baa 100644 --- a/api/version1/grantpowers/postpower.go +++ b/api/version1/grantpowers/postpower.go @@ -36,12 +36,23 @@ import ( # */ func (a *ApiMethod) GetPostGrantPowers(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GetPostPowerCont - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData GetPostPowerCont + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrdId == "" || requestData.OrdId == "0" { publicmethod.Result(1, requestData, c, "未知行政组织！不可进行配权") return @@ -178,12 +189,24 @@ func GetWmsMenuPower(menusPower []string) (powersList []string) { # */ func (a *ApiMethod) GetRoleGrantPowers(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GetRolePowerCont - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData GetRolePowerCont + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.RoleId == "" || requestData.RoleId == "0" { publicmethod.Result(1, requestData, c, "未知角色！不可进行配权") return @@ -244,8 +267,19 @@ func (a *ApiMethod) GetRoleGrantPowers(c *gin.Context) { # */ func (a *ApiMethod) GainAppList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppIdAndRoleNew - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GainAppIdAndRoleNew + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { requestData.PowerType = "org" } @@ -299,12 +333,23 @@ func (a *ApiMethod) GainAppList(c *gin.Context) { # */ func (a *ApiMethod) GainAppTableList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppIdAndRole - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData GainAppIdAndRole + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知App！不可获取表单列表！") return @@ -397,8 +442,19 @@ func GainAppTablePower(roleId, appSignCode, tableId int64) (formPower SendAppTab # */ func (a *ApiMethod) SetpAppTableForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppTableInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GainAppTableInfo + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知App！不可获取表单列表！") return @@ -513,12 +569,23 @@ func (a *AppTableMsgInfo) AppTablePowerSave(roleId, appSignCode string, list Cus @ 功能: 获取应用基本盘面 */ func (a *ApiMethod) GainAppTableListNew(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppIdAndRoleNew - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData GainAppIdAndRoleNew + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知App！不可获取表单列表！") return @@ -652,8 +719,19 @@ func CallBackAppMenuPower(tableInfo modelAppPlatform.Appmenus, powerList []publi @ 功能: 初始化应用授权选项 */ func (a *ApiMethod) AppInitAuthorization(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainAppIdAndRoleNew - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData GainAppIdAndRoleNew + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { requestData.PowerType = "org" } @@ -999,8 +1077,19 @@ func AppMenuCallBackShow(menuId int64, authId []int64) (isTrue bool, pagePower, @ 功能: 选项卡App授权模式 */ func (a *ApiMethod) TabsAuthorizationMode(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SaveAppPower - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData SaveAppPower + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知授权类型！不可编辑权限！") return @@ -1035,7 +1124,7 @@ func (a *ApiMethod) TabsAuthorizationMode(c *gin.Context) { groupBurStr, _ := json.Marshal(requestData.GroupPower) //写入App分组权限 var appGroupPower modelssystempermission.AuthGroupPower - err := appGroupPower.GetCont(map[string]interface{}{"`orgPowerType`": requestData.PowerType, "`appType`": requestData.AppType, "`orgOrUserKey`": requestData.RoleId}) + err = appGroupPower.GetCont(map[string]interface{}{"`orgPowerType`": requestData.PowerType, "`appType`": requestData.AppType, "`orgOrUserKey`": requestData.RoleId}) if err == nil && appGroupPower.Id != 0 { //编辑 saveData := publicmethod.MapOut[string]() saveData["groupStatus"] = string(groupIsShow) diff --git a/api/version1/humanResources/org.go b/api/version1/humanResources/org.go index 6fbacda..c105241 100644 --- a/api/version1/humanResources/org.go +++ b/api/version1/humanResources/org.go @@ -23,12 +23,24 @@ import ( @ 功能: 行政组织树 */ func (a *ApiMethod) AuthorizeOrgTree(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData MenuIdCont - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData MenuIdCont + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } context, _ := c.Get(overall.MyContJwt) var myContInfo modelshr.ManCont jsonCont, _ := json.Marshal(context) @@ -36,7 +48,7 @@ func (a *ApiMethod) AuthorizeOrgTree(c *gin.Context) { var orgList []modelshr.OrgCont gotmDb := overall.CONSTANT_DB_HR.Model(&modelshr.OrgCont{}).Where("state = ?", 1) - fmt.Printf("权限-----22222222222222222222222222222222222222222222222222222222222222222222222---->%v\n\n\n", gotmDb) + fmt.Printf("权限-----22222222222222222222222222222222222222222222222222222222222222222222222---->%v\n\n\n", string(dataVal)) //获取权限 myPower := publicmethod.GetMyMenuPower(myContInfo.Key, requestData.MenuId) myPowerJson, _ := json.Marshal(myPower) @@ -71,7 +83,7 @@ func (a *ApiMethod) AuthorizeOrgTree(c *gin.Context) { fisrtId = publicmethod.GetFristOrgId(oid) gotmDb = gotmDb.Where("`id` IN ?", myPower.ScopeManAry) case 6: - fisrtId = 313 + fisrtId = 312 default: fisrtId = myContInfo.MainDeparment var sunGroupId publicmethod.GetOrgAllParent diff --git a/api/version1/humanResources/peopel.go b/api/version1/humanResources/peopel.go index 4f7446b..5f8a482 100644 --- a/api/version1/humanResources/peopel.go +++ b/api/version1/humanResources/peopel.go @@ -19,8 +19,19 @@ import ( @ 功能: 根据权限获取数据 */ func (a *ApiMethod) AuthorizePeopleList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData SearchPowPople - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(102, err, c, "不太好吧") + // return + // } + // var requestData SearchPowPople + // c.ShouldBindJSON(&requestData) if requestData.Page < 0 { requestData.Page = 1 } @@ -137,7 +148,7 @@ func (a *ApiMethod) AuthorizePeopleList(c *gin.Context) { } var idAry []int64 gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Order("`time` DESC").Find(&idAry).Error + err = gormDb.Order("`time` DESC").Find(&idAry).Error if err != nil && len(idAry) < 1 { publicmethod.ResultList(0, requestData.Page, requestData.PageSize, total, int64(len(idAry)), idAry, c) return @@ -219,12 +230,23 @@ func (a *ApiMethod) AuthorizePeopleList(c *gin.Context) { @ 功能: 新增人员 */ func (a *ApiMethod) AddNewPeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData PeopleInfo - err := c.ShouldBindJSON(&requestData) - if requestData.OrgId == 0 { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c, "请选择归属部门") return } + // var requestData PeopleInfo + // err := c.ShouldBindJSON(&requestData) + // if requestData.OrgId == 0 { + // publicmethod.Result(100, err, c, "请选择归属部门") + // return + // } if requestData.Name == "" { publicmethod.Result(100, err, c, "请输入姓名") return @@ -291,12 +313,23 @@ func (a *ApiMethod) AddNewPeople(c *gin.Context) { @ 功能: 编辑自己登陆密码 */ func (a *ApiMethod) EditMyPwd(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SaveMyPwd - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SaveMyPwd + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OldPassword == "" || requestData.NewPassword == "" || requestData.ConfirmPassword == "" { publicmethod.Result(1, requestData, c, "您输入的数据不符合要求！") return diff --git a/api/version1/matrixApi/api.go b/api/version1/matrixApi/api.go index 6b3869f..5e47d9d 100644 --- a/api/version1/matrixApi/api.go +++ b/api/version1/matrixApi/api.go @@ -5,6 +5,7 @@ import ( "appPlatform/models/modelshr" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "sort" "strconv" "time" @@ -30,8 +31,20 @@ import ( # */ func (a *ApiMethod) MatrixList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SearchMatrix - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData SearchMatrix + // c.ShouldBindJSON(&requestData) if requestData.Page == 0 { requestData.Page = 1 } @@ -55,7 +68,7 @@ func (a *ApiMethod) MatrixList(c *gin.Context) { total = 0 } gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Find(&matrixInfoList).Error + err = gormDb.Find(&matrixInfoList).Error if err != nil { publicmethod.Result(105, err, c) return @@ -95,12 +108,24 @@ func (a *ApiMethod) MatrixList(c *gin.Context) { # */ func (a *ApiMethod) AddMatrixCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddMatrixCont - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AddMatrixCont + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Name == "" { publicmethod.Result(1, requestData.Name, c, "请输入矩阵名称！") return @@ -152,8 +177,19 @@ func (a *ApiMethod) AddMatrixCont(c *gin.Context) { # */ func (a *ApiMethod) EditMatrixCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditMatrixCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData EditMatrixCont + // c.ShouldBindJSON(&requestData) if requestData.Id == 0 { publicmethod.Result(1, requestData.Name, c, "未知矩阵！") return @@ -161,7 +197,7 @@ func (a *ApiMethod) EditMatrixCont(c *gin.Context) { where := publicmethod.MapOut[string]() where["`id`"] = requestData.Id var matrixInfo modelAppPlatform.MatrixContent - err := matrixInfo.GetCont(where) + err = matrixInfo.GetCont(where) if err != nil { publicmethod.Result(107, err, c) return @@ -217,12 +253,23 @@ func (a *ApiMethod) EditMatrixCont(c *gin.Context) { # */ func (a *ApiMethod) EditStatusCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditState - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditState + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if len(requestData.Id) < 1 { publicmethod.Result(1, requestData.Id, c, "未知矩阵！") return @@ -273,12 +320,23 @@ func (a *ApiMethod) EditStatusCont(c *gin.Context) { # */ func (a *ApiMethod) SetupMatrixField(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData HaveMatrixField - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData HaveMatrixField + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == 0 { publicmethod.Result(1, err, c, "未知矩阵！请检查提交数据") return @@ -358,12 +416,24 @@ func AddOrEditMatrixField(matrixId int64, cont MatrixField) (err error) { # */ func (a *ApiMethod) GetMatrixField(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[int64] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[int64] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == 0 { publicmethod.Result(1, err, c, "未知矩阵！请检查提交数据") return @@ -412,8 +482,19 @@ func (a *ApiMethod) GetMatrixField(c *gin.Context) { # */ func (a *ApiMethod) SubmitMatrixData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData []ReceiveMartix - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData []ReceiveMartix + // c.ShouldBindJSON(&requestData) if len(requestData) < 1 { publicmethod.Result(1, requestData, c, "未知矩阵！请检查提交数据") return @@ -473,12 +554,23 @@ func (a *ApiMethod) SubmitMatrixData(c *gin.Context) { # */ func (a *ApiMethod) GainMatrixData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[int64] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.CommonId[int64] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == 0 { publicmethod.Result(1, err, c, "未知矩阵！请检查提交数据") return @@ -556,8 +648,19 @@ func (a *ApiMethod) GainMatrixData(c *gin.Context) { */ func (a *ApiMethod) MatrixValue(c *gin.Context) { // requestData := publicmethod.MapOut[string]() + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData OneMatrixVal - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData OneMatrixVal + // err := c.ShouldBindJSON(&requestData) var matrixContNumber []int64 gormDb := overall.CONSTANT_DB_AppPlatform.Model(&modelAppPlatform.MatrixHandler{}).Select("`number`") diff --git a/api/version1/menus/menus.go b/api/version1/menus/menus.go index 622ae05..17e10db 100644 --- a/api/version1/menus/menus.go +++ b/api/version1/menus/menus.go @@ -155,8 +155,20 @@ func (a *ApiMethod) MenuOptions(c *gin.Context) { # */ func (a *ApiMethod) AddNewMenu(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AddNewMenuCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) + return + } + + // var requestData AddNewMenuCont + // c.ShouldBindJSON(&requestData) if requestData.Name == "" { publicmethod.Result(1, requestData, c, "请输入菜单名称！") return @@ -202,7 +214,7 @@ func (a *ApiMethod) AddNewMenu(c *gin.Context) { menuCont.ParentId = requestData.ParentId //父菜单ID"` menuCont.Time = time.Now().Unix() //创建时间"` menuCont.Outside = requestData.Outside //1：内部使用；2：外部使用；3：内外使用"` - err := overall.CONSTANT_DB_AppPlatform.Create(&menuCont).Error + err = overall.CONSTANT_DB_AppPlatform.Create(&menuCont).Error if err != nil { publicmethod.Result(104, err, c) return @@ -228,12 +240,23 @@ func (a *ApiMethod) AddNewMenu(c *gin.Context) { # */ func (a *ApiMethod) GetOneMenuCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知菜单！") return @@ -277,8 +300,20 @@ func (a *ApiMethod) GetOneMenuCont(c *gin.Context) { # */ func (a *ApiMethod) EditMenusCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditMenuCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData EditMenuCont + // c.ShouldBindJSON(&requestData) if requestData.Id == 0 { publicmethod.Result(1, requestData, c, "未知菜单！") return @@ -299,7 +334,7 @@ func (a *ApiMethod) EditMenusCont(c *gin.Context) { whe := publicmethod.MapOut[string]() whe["`id`"] = requestData.Id var menuCont modelAppPlatform.Menus - err := menuCont.GetCont(whe) + err = menuCont.GetCont(whe) if err != nil { publicmethod.Result(107, err, c) return @@ -394,12 +429,23 @@ func (a *ApiMethod) EditMenusCont(c *gin.Context) { # */ func (a *ApiMethod) DeltMenusCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知菜单！") return @@ -741,12 +787,24 @@ func (m *MyLookOrg) RoleLookOrg() { # */ func (a *ApiMethod) GainShiftRules(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, requestData, c, "未知菜单！") return @@ -893,8 +951,19 @@ func GainWorkTimePer(id int64) (timePeriodList []RulerPublicInfo) { # */ func (a *ApiMethod) AnalysisMonthRulers(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AnYuePaiBan - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AnYuePaiBan + // c.ShouldBindJSON(&requestData) // err := c.ShouldBindJSON(&requestData) // if err != nil { // publicmethod.Result(100, requestData, c) diff --git a/api/version1/menus/workTems.go b/api/version1/menus/workTems.go index 0c30bd6..36048a4 100644 --- a/api/version1/menus/workTems.go +++ b/api/version1/menus/workTems.go @@ -33,12 +33,23 @@ import ( # */ func (a *ApiMethod) AddTeamTime(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SetWorkTime - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SetWorkTime + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Name == "" { publicmethod.Result(101, requestData, c) return @@ -135,12 +146,23 @@ func WriteWorkTime(key int64, workTimeList []modelshr.WorkingTimePeriod) (err er # */ func (a *ApiMethod) EditWorkTimeCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditWorkTimeConts - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditWorkTimeConts + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(101, requestData, c) return @@ -286,8 +308,19 @@ func EditPeriodTime(typeId int64, ruleList []TemaTimes) { # */ func (a *ApiMethod) SaveCycleRules(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData JieShoeTeamsRules - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData JieShoeTeamsRules + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(101, requestData, c) return @@ -358,8 +391,19 @@ func (a *ApiMethod) SaveCycleRules(c *gin.Context) { # */ func (a *ApiMethod) GainCycleRule(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) var sendData JieShoeTeamsRules if err != nil { publicmethod.Result(200, sendData, c) @@ -446,8 +490,19 @@ func (a *ApiMethod) GainCycleRule(c *gin.Context) { # */ func (a *ApiMethod) AnalysisMonthRulersNews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AnYuePaiBan - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AnYuePaiBan + // c.ShouldBindJSON(&requestData) if requestData.OrgId == "" { publicmethod.Result(1, requestData, c, "未知行政单位") return @@ -778,8 +833,19 @@ func (g *GenesInfo) SpecifyDateTeamsNew(dataInfo CalendarStructure, timeVal publ # */ func (a *ApiMethod) AnalysisWeekRulers(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AnZhouPaiBan - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AnZhouPaiBan + // c.ShouldBindJSON(&requestData) if requestData.OrgId == "" { publicmethod.Result(1, requestData, c, "未知行政单位") return diff --git a/api/version1/newsclass/newsapi.go b/api/version1/newsclass/newsapi.go index 59e39e8..4d174ea 100644 --- a/api/version1/newsclass/newsapi.go +++ b/api/version1/newsclass/newsapi.go @@ -5,6 +5,7 @@ import ( "appPlatform/models/modelshr" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "strconv" "github.com/gin-gonic/gin" @@ -28,12 +29,23 @@ import ( # */ func (a *ApiMethod) HotNews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData HosNewsParameter - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var requestData HosNewsParameter + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } @@ -150,12 +162,23 @@ func (a *ApiMethod) HotNews(c *gin.Context) { # */ func (a *ApiMethod) HomeCarouselImage(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData CarouselImage - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var requestData CarouselImage + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.Num == 0 { requestData.Num = 1 } @@ -190,8 +213,19 @@ func (a *ApiMethod) HomeCarouselImage(c *gin.Context) { # */ func (a *ApiMethod) GetHomenNews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData NewsClassInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData NewsClassInfo + // c.ShouldBindJSON(&requestData) //获取当前登录人信息 context, _ := c.Get(overall.MyContJwt) var userCont modelshr.ManCont @@ -238,7 +272,7 @@ func (a *ApiMethod) GetHomenNews(c *gin.Context) { if requestData.Limit < 1 { requestData.Limit = 1 } - err := gormDb.Limit(requestData.Limit).Find(&list).Error + err = gormDb.Limit(requestData.Limit).Find(&list).Error if err != nil && len(list) < 1 { publicmethod.Result(0, err, c) return @@ -268,12 +302,23 @@ func (a *ApiMethod) GetHomenNews(c *gin.Context) { # */ func (a *ApiMethod) GetNewType(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知参数！") return @@ -308,12 +353,23 @@ func (a *ApiMethod) GetNewType(c *gin.Context) { # */ func (a *ApiMethod) NewHotNews(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData HosNewsParameter - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var requestData HosNewsParameter + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } diff --git a/api/version1/publicapi/api.go b/api/version1/publicapi/api.go index 942535b..c4292d3 100644 --- a/api/version1/publicapi/api.go +++ b/api/version1/publicapi/api.go @@ -38,12 +38,23 @@ import ( # */ func (a *ApiMethod) ChineseInitial(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicName - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicName + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Name == "" { publicmethod.Result(1, requestData.Name, c, "请输入关键字！") return @@ -97,11 +108,22 @@ func (a *ApiMethod) ChineseInitial(c *gin.Context) { # */ func (a *ApiMethod) SendNumber(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[int64] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - requestData.Id = 9 + publicmethod.Result(100, err, c) + return } + // var requestData publicmethod.CommonId[int64] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // requestData.Id = 9 + // } if requestData.Id == 0 { requestData.Id = 9 } @@ -174,8 +196,19 @@ func (a *ApiMethod) GenerateSignCode(c *gin.Context) { # */ func (a *ApiMethod) ChineseToPinyin(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData HanziToPinyin - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData HanziToPinyin + // c.ShouldBindJSON(&requestData) if requestData.Title == "" { publicmethod.Result(1, requestData, c, "未知中文语句！") return @@ -308,12 +341,24 @@ func (a *ApiMethod) CreateOneClickLogin(c *gin.Context) { return } sendMap := publicmethod.MapOut[string]() + + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SendUrl - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.UrlStr == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SendUrl + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.UrlStr == "" { + // publicmethod.Result(100, err, c) + // return + // } timeVal := time.Now().UnixNano() / 1e6 urlStr := fmt.Sprintf("/insensibleLogin?userkey=%v&usertoken=%v&time=%v", userKey, userToken, timeVal) if !strings.HasPrefix(requestData.UrlStr, "https://") && !strings.HasPrefix(requestData.UrlStr, "http://") { @@ -354,8 +399,19 @@ func (a *ApiMethod) CreateOneClickLogin(c *gin.Context) { # */ func (a *ApiMethod) GainNumber(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainRulsNumner - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) + return + } + // var requestData GainRulsNumner + // c.ShouldBindJSON(&requestData) uuid := strconv.FormatInt(publicmethod.GetUUid(1), 10) // fmt.Printf("uuidAry---->%v\n", requestData) if requestData.Automatic { @@ -588,12 +644,24 @@ func (a *ApiMethod) ObtainToken(c *gin.Context) { ContentType := c.Request.Header.Get("Content-Type") Origin := c.Request.Header.Get("Origin") userAgent := c.Request.Header.Get("User-Agent") + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData gainAuthorize - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData gainAuthorize + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.UserNumber == "" || requestData.Password == "" { publicmethod.Result(101, err, c) return @@ -984,12 +1052,25 @@ func (a *ApiMethod) SilentLogin(c *gin.Context) { ContentType := c.Request.Header.Get("Content-Type") origin := c.Request.Header.Get("Origin") userAgent := c.Request.Header.Get("User-Agent") + + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SilentLoginInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SilentLoginInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Token == "" || requestData.Number == "" || requestData.Time == "" || requestData.Code == "" { publicmethod.Result(10001, ContentType, c, "token错误") return @@ -1243,8 +1324,20 @@ func (a *ApiMethod) SilentLogin(c *gin.Context) { # */ func (a *ApiMethod) GainAllRole(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicName - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData publicmethod.PublicName + // err := c.ShouldBindJSON(&requestData) var sendData []UserOrgRole // if err != nil { // publicmethod.Result(0, sendData, c) diff --git a/api/version1/setupRoule/authorization.go b/api/version1/setupRoule/authorization.go index 377c361..f1abfe8 100644 --- a/api/version1/setupRoule/authorization.go +++ b/api/version1/setupRoule/authorization.go @@ -19,8 +19,19 @@ import ( @ 功能: 授权 */ func (a *ApiMethod) SystemAppAuthorization(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData AppSystemInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(102, err, c) + // return + // } + // var requestData AppSystemInfo + // c.ShouldBindJSON(&requestData) if requestData.PowerType == "" { publicmethod.Result(1, requestData, c, "未知赋权分类！请明确！") return @@ -71,7 +82,7 @@ func (a *ApiMethod) SystemAppAuthorization(c *gin.Context) { appButPowerJson, _ = json.Marshal(appButPworAry.Id) } fmt.Printf("\n\nappButPowerJson-------------》%v----1----》%v\n\n", requestData.AppFormButConfig, appButPowerJson) - err := gormDb.First(&powerMastInfo).Error + err = gormDb.First(&powerMastInfo).Error uuid := publicmethod.GetUUid(1) oukId, _ := strconv.ParseInt(requestData.RoleId, 10, 64) appId, _ := strconv.ParseInt(requestData.AppId, 10, 64) diff --git a/api/version1/setupRoule/orgPeople.go b/api/version1/setupRoule/orgPeople.go index 93e7103..273e8da 100644 --- a/api/version1/setupRoule/orgPeople.go +++ b/api/version1/setupRoule/orgPeople.go @@ -5,6 +5,7 @@ import ( "appPlatform/models/modelssystempermission" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "strconv" "strings" @@ -20,12 +21,23 @@ import ( @ 功能: 获取首层子行政组织和本组织下的人员 */ func (a *ApiMethod) GetMyPeopleAndSunOrg(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData HaveOrgLeveID - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, err, c) + publicmethod.Result(102, err, c) return } + // var requestData HaveOrgLeveID + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { requestData.Id = "0" } @@ -166,12 +178,23 @@ func GetPostPeopleList(orgId int64) (snedList []TopSunOrgAndPeople) { @ 功能: 获取首层子行政组织和本组织下的岗位及人员 */ func (a *ApiMethod) GetMyPeopleAndSunOrgPost(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData HaveOrgPostLeveID - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, err, c) + publicmethod.Result(102, err, c) return } + // var requestData HaveOrgPostLeveID + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { requestData.Id = "0" } @@ -261,8 +284,19 @@ func GetPostPeopleListAry(postId int64) (snedList []TopSunOrgAndPeople) { // 获取人员 func (a *ApiMethod) GetPowerPageUser(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData PowerPageUser - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(102, err, c) + // return + // } + // var requestData PowerPageUser + // c.ShouldBindJSON(&requestData) if requestData.Page == 0 { requestData.Page = 1 } @@ -286,7 +320,7 @@ func (a *ApiMethod) GetPowerPageUser(c *gin.Context) { total = 0 } gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Order("`id` DESC").Find(&peopleList).Error + err = gormDb.Order("`id` DESC").Find(&peopleList).Error if err != nil { publicmethod.Result(105, err, c) return @@ -340,14 +374,25 @@ func (a *ApiMethod) GetPowerPageUser(c *gin.Context) { @ 功能: 获取角色使用人 */ func (a *ApiMethod) GetRolePeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData GetRolePople - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(102, err, c) + // return + // } + // var requestData GetRolePople + // c.ShouldBindJSON(&requestData) if requestData.RoleId == 0 { publicmethod.Result(3, requestData, c, "未知赋权项目！请明确！") return } var roleInfo modelssystempermission.SystemRole - err := overall.CONSTANT_DB_System_Permission.Model(&roleInfo).Where("`id` = ?", requestData.RoleId).First(&roleInfo).Error + err = overall.CONSTANT_DB_System_Permission.Model(&roleInfo).Where("`id` = ?", requestData.RoleId).First(&roleInfo).Error if err != nil { publicmethod.Result(1, requestData, c, "未知赋权项目！请明确！") return @@ -427,12 +472,23 @@ func (a *ApiMethod) GetRolePeople(c *gin.Context) { @ 功能: 保存角色使用人 */ func (a *ApiMethod) SavePickRoleMan(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData SetupRoleMan - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, err, c) + publicmethod.Result(102, err, c) return } + // var requestData SetupRoleMan + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.RoleId == 0 { publicmethod.Result(3, requestData, c, "未知赋权项目！请明确！") return diff --git a/api/version1/setupRoule/power.go b/api/version1/setupRoule/power.go index 8c762ef..1d2521a 100644 --- a/api/version1/setupRoule/power.go +++ b/api/version1/setupRoule/power.go @@ -5,6 +5,7 @@ import ( "appPlatform/models/modelssystempermission" "appPlatform/overall" "appPlatform/overall/publicmethod" + "encoding/json" "sort" "strconv" "time" @@ -14,12 +15,23 @@ import ( // 获取平台授权项目 func (a *ApiMethod) AppPowerUnit(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData GetPowerUnitParameter - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, err, c) + publicmethod.Result(102, err, c) return } + // var requestData GetPowerUnitParameter + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.PowerType == "" { requestData.PowerType = "org" } @@ -224,13 +236,24 @@ func MenuPower(menuInfo []AppMenuBut, powerInfo publicmethod.SendSystemPower) (m @ 功能: 复制角色 */ func (a *ApiMethod) CopyRolePower(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(102, err, c) + return + } var requestData CopyRolePowerInfo - - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(100, err, c) + publicmethod.Result(102, err, c) return } + // var requestData CopyRolePowerInfo + + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Label == "" { publicmethod.Result(1, requestData, c, "角色为命名！") return @@ -256,7 +279,7 @@ func (a *ApiMethod) CopyRolePower(c *gin.Context) { newRoleInfo.Sort = roleInfo.Sort //排序"` newRoleInfo.Types = roleInfo.Types //类型"` newRoleInfo.Superior = roleInfo.Superior //上级"` - newRoleInfo.Roleuser = roleInfo.Roleuser //nt:使用人员"` + // newRoleInfo.Roleuser = roleInfo.Roleuser //nt:使用人员"` err = overall.CONSTANT_DB_System_Permission.Create(&newRoleInfo).Error if err != nil { publicmethod.Result(100, err, c) diff --git a/api/version1/taskplatform/matsFormula/formula.go b/api/version1/taskplatform/matsFormula/formula.go index 2c605b4..5f97fa8 100644 --- a/api/version1/taskplatform/matsFormula/formula.go +++ b/api/version1/taskplatform/matsFormula/formula.go @@ -2,6 +2,7 @@ package matsformula import ( "appPlatform/overall/publicmethod" + "encoding/json" "fmt" "math" "strconv" @@ -29,12 +30,23 @@ import ( # */ func (a *ApiMethod) AnalyticalMathematicalFormulas(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestsData Formula - err := c.ShouldBindJSON(&requestsData) + err = json.Unmarshal(dataVal, &requestsData) if err != nil { - publicmethod.Result(1, err, c) + publicmethod.Result(100, err, c) return } + // var requestsData Formula + // err := c.ShouldBindJSON(&requestsData) + // if err != nil { + // publicmethod.Result(1, err, c) + // return + // } mathsStr := requestsData.Val for _, v := range requestsData.FormJson { zhi := strconv.FormatFloat(v.Val, 'f', -1, 64) @@ -134,12 +146,23 @@ func AnalyticCalculation(mathsFormula string, takingMethod, digit int) (runMaths # */ func (a *ApiMethod) MathematicalCalculations(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestsData ReceiveMathsFornula - err := c.ShouldBindJSON(&requestsData) + err = json.Unmarshal(dataVal, &requestsData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var requestsData ReceiveMathsFornula + // err := c.ShouldBindJSON(&requestsData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } zhi := make(map[string]float64) var formulaList []FormJsonInfor for i, v := range requestsData.MathsFornula { diff --git a/api/version1/taskplatform/taskflowing/analyFormJson.go b/api/version1/taskplatform/taskflowing/analyFormJson.go index c6c2fc6..0a89326 100644 --- a/api/version1/taskplatform/taskflowing/analyFormJson.go +++ b/api/version1/taskplatform/taskflowing/analyFormJson.go @@ -11,12 +11,23 @@ import ( // 解析表单格式 func (a *ApiMethod) AnalyFormJsonMap(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AnalysisNodesUnitPower - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData AnalysisNodesUnitPower + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.NodeKey == "" { requestData.NodeKey = "begin" } diff --git a/api/version1/taskplatform/taskflowing/appTaskFlow.go b/api/version1/taskplatform/taskflowing/appTaskFlow.go index 92622fd..2aff7bc 100644 --- a/api/version1/taskplatform/taskflowing/appTaskFlow.go +++ b/api/version1/taskplatform/taskflowing/appTaskFlow.go @@ -35,8 +35,19 @@ import ( # */ func (a *ApiMethod) GainAppTaskList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppTaskSearch - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData AppTaskSearch + // c.ShouldBindJSON(&requestData) if requestData.Id == "" { publicmethod.Result(100, requestData, c) return @@ -79,7 +90,7 @@ func (a *ApiMethod) GainAppTaskList(c *gin.Context) { } var idAry []int64 gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Order("`update_time` desc").Find(&idAry).Error + err = gormDb.Order("`update_time` desc").Find(&idAry).Error var userList []SendAppTaskFlowInfo if err != nil || len(idAry) < 1 { publicmethod.ResultList(0, requestData.Page, requestData.PageSize, total, int64(len(userList)), userList, c) @@ -307,12 +318,24 @@ func (a *ApiMethod) RunAppWorkFlow(c *gin.Context) { # */ func (a *ApiMethod) EditTaskAppInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return diff --git a/api/version1/taskplatform/taskflowing/editformflow.go b/api/version1/taskplatform/taskflowing/editformflow.go index 6080f4b..b85a876 100644 --- a/api/version1/taskplatform/taskflowing/editformflow.go +++ b/api/version1/taskplatform/taskflowing/editformflow.go @@ -36,12 +36,24 @@ import ( # */ func (a *ApiMethod) GainEditFormFlowInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return @@ -378,6 +390,7 @@ func (f *FormDataLog) GainFlowFoemLog() { # */ func (a *ApiMethod) EditFormLogData(c *gin.Context) { + data, err := c.GetRawData() //接收表单提交得数据 if err != nil { publicmethod.Result(100, err, c) @@ -615,12 +628,24 @@ func EditSunDatabase(uuid, creater, createrOrg, userPositon, createrTime int64, # */ func (a *ApiMethod) GainFlowLookSee(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return @@ -768,12 +793,23 @@ func GainWorkflowLookView(flowKey int64) (lookPower []LookPowerCont) { # */ func (a *ApiMethod) EditLookPowerView(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData LookPowerEdit - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData LookPowerEdit + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return @@ -900,8 +936,19 @@ func EditFlowLookView(flowKey int64, ListData []LookPowerCont) { # */ func (a *ApiMethod) SetUpMsg(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SetMsgInfo - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData SetMsgInfo + // err := c.ShouldBindJSON(&requestData) if err != nil { publicmethod.Result(100, err, c) return @@ -954,12 +1001,23 @@ func (a *ApiMethod) SetUpMsg(c *gin.Context) { # */ func (a *ApiMethod) GainSetUpMsg(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return diff --git a/api/version1/taskplatform/taskflowing/flowengine.go b/api/version1/taskplatform/taskflowing/flowengine.go index a5b3af5..1034c34 100644 --- a/api/version1/taskplatform/taskflowing/flowengine.go +++ b/api/version1/taskplatform/taskflowing/flowengine.go @@ -31,12 +31,23 @@ import ( # */ func (a *ApiMethod) SaveFlowCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData FlowMainBody - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData FlowMainBody + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.NodeConfig.NodeNumber == "" { publicmethod.Result(1, err, c, "工作流数据错误！请检查后再提交") return @@ -165,12 +176,24 @@ func (a *ApiMethod) SaveFlowCont(c *gin.Context) { # */ func (a *ApiMethod) GainFlowInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } var flowVersionInfo modelAppPlatform.FlowVersion err = flowVersionInfo.GetCont(map[string]interface{}{"`id`": requestData.Id}, "`content`") if err != nil && flowVersionInfo.Content == "" { @@ -204,12 +227,23 @@ func (a *ApiMethod) GainFlowInfo(c *gin.Context) { # */ func (a *ApiMethod) EditFlowCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditFlowInfo - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditFlowInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } fmt.Printf("=======================>%v\n", requestData) why := publicmethod.MapOut[string]() why["`id`"] = requestData.Id @@ -303,12 +337,23 @@ func (a *ApiMethod) EditFlowCont(c *gin.Context) { # */ func (a *ApiMethod) SaveNewFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditFlowInfo - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + // var requestData EditFlowInfo + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } why := publicmethod.MapOut[string]() why["`id`"] = requestData.Id var flowVersionInfo modelAppPlatform.FlowVersion @@ -414,12 +459,24 @@ func (a *ApiMethod) SaveNewFlow(c *gin.Context) { # */ func (a *ApiMethod) SwitchFlowVersion(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SwitchFlowStatus - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SwitchFlowStatus + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Status == 0 { requestData.Status = 2 } diff --git a/api/version1/taskplatform/taskflowing/runflow.go b/api/version1/taskplatform/taskflowing/runflow.go index 7aafe73..111250e 100644 --- a/api/version1/taskplatform/taskflowing/runflow.go +++ b/api/version1/taskplatform/taskflowing/runflow.go @@ -33,12 +33,23 @@ import ( # */ func (a *ApiMethod) GenerateFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData CreatFlowView - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + // var requestData CreatFlowView + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.Step == 0 { requestData.Step = 1 } @@ -1071,12 +1082,24 @@ func GainUserCode(userNumber []string) (userAry []OperatorList) { # */ func (a *ApiMethod) GainFlowPeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainFlowOperator - err := c.ShouldBindJSON(&requestData) - if err != nil || len(requestData.Numbers) < 1 { - publicmethod.Result(10001, err, c) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) return } + + // var requestData GainFlowOperator + // err := c.ShouldBindJSON(&requestData) + // if err != nil || len(requestData.Numbers) < 1 { + // publicmethod.Result(10001, err, c) + // return + // } usSry := GainUserCode(requestData.Numbers) if len(usSry) < 1 { publicmethod.Result(10001, err, c, "没有数据") @@ -1103,8 +1126,20 @@ func (a *ApiMethod) GainFlowPeople(c *gin.Context) { # */ func (a *ApiMethod) SearchUserList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SearchUserCont - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData SearchUserCont + // c.ShouldBindJSON(&requestData) if requestData.Page == 0 { requestData.Page = 1 } @@ -1129,7 +1164,7 @@ func (a *ApiMethod) SearchUserList(c *gin.Context) { } var idAry []string gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) - err := gormDb.Find(&idAry).Error + err = gormDb.Find(&idAry).Error var userList []OperatorList if err != nil || len(idAry) < 1 { publicmethod.ResultList(0, requestData.Page, requestData.PageSize, total, int64(len(userList)), userList, c) diff --git a/api/version1/taskplatform/taskflowing/taskFlow.go b/api/version1/taskplatform/taskflowing/taskFlow.go index 8ea8dd6..55e7a45 100644 --- a/api/version1/taskplatform/taskflowing/taskFlow.go +++ b/api/version1/taskplatform/taskflowing/taskFlow.go @@ -34,12 +34,24 @@ import ( # */ func (a *ApiMethod) TaskFlowList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData QueryTaskFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData QueryTaskFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } @@ -259,12 +271,24 @@ func GainSmaillUserInfo[T publicmethod.GenericityVariable](userKey T) (createrIn # */ func (a *ApiMethod) GainRunTaskFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -547,12 +571,23 @@ func NotSignJointly(runKey int64, state int, Operator []OperatorList, userCont m # */ func (a *ApiMethod) SubmitApprovalResults(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SubmitAppResults - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SubmitAppResults + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -946,12 +981,24 @@ func (r *RunWorkFlow) FlowStepRun(userKey int64, AgreeToRefuse int, Suggest stri # */ func (a *ApiMethod) DelRunFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicStates - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicStates + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -1011,12 +1058,24 @@ func (a *ApiMethod) DelRunFlow(c *gin.Context) { # */ func (a *ApiMethod) AfreshRunFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -1103,12 +1162,23 @@ func (a *ApiMethod) AfreshRunFlow(c *gin.Context) { # */ func (a *ApiMethod) RetractRunFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return diff --git a/api/version1/taskplatform/taskflowing/workFlowRun.go b/api/version1/taskplatform/taskflowing/workFlowRun.go index a5f877a..cedec82 100644 --- a/api/version1/taskplatform/taskflowing/workFlowRun.go +++ b/api/version1/taskplatform/taskflowing/workFlowRun.go @@ -33,12 +33,24 @@ import ( # */ func (a *ApiMethod) StartRunFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData StartFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c) + publicmethod.Result(100, err, c) return } + + // var requestData StartFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(10001, err, c, "未知进程！不可执行") return diff --git a/api/version1/taskplatform/taskflowing/workflow.go b/api/version1/taskplatform/taskflowing/workflow.go index 4a6945c..19071dc 100644 --- a/api/version1/taskplatform/taskflowing/workflow.go +++ b/api/version1/taskplatform/taskflowing/workflow.go @@ -31,8 +31,19 @@ import ( # */ func (a *ApiMethod) InitializeWorkFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicName - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData publicmethod.PublicName + // c.ShouldBindJSON(&requestData) var workFlowStruct FlowStructIng workFlowStruct.TableId = strconv.FormatInt(publicmethod.GetUUid(2), 10) if requestData.Name != "" { @@ -70,12 +81,23 @@ func (a *ApiMethod) InitializeWorkFlow(c *gin.Context) { # */ func (a *ApiMethod) GainFlowVersionList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { - publicmethod.Result(10001, err, c) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) return } + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(10001, err, c) + // return + // } var flowVersionList []modelAppPlatform.FlowVersion err = overall.CONSTANT_DB_AppPlatform.Where("`state` IN ? AND `formkey` = ?", []int{1, 2}, requestData.Id).Find(&flowVersionList).Error if err != nil || len(flowVersionList) < 1 { @@ -112,12 +134,24 @@ func (a *ApiMethod) GainFlowVersionList(c *gin.Context) { # */ func (a *ApiMethod) GainNodeFactor(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainNodeFactor - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData GainNodeFactor + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } var customerFormCont modelAppPlatform.CustomerForm err = customerFormCont.GetCont(map[string]interface{}{"`id`": requestData.Id}, "`tablename`") if err != nil { @@ -267,12 +301,24 @@ func (f *CustomerFormUnit) GetFormUnit(tablename string, subUnitAry []customerfo # */ func (a *ApiMethod) JudgeFormFlowIsOpen(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } sendData := publicmethod.MapOut[string]() var customerFormCont modelAppPlatform.CustomerForm err = customerFormCont.GetCont(map[string]interface{}{"`id`": requestData.Id}, "`flowkey`", "`flowIsOpen`") @@ -305,12 +351,24 @@ func (a *ApiMethod) JudgeFormFlowIsOpen(c *gin.Context) { # */ func (a *ApiMethod) OpenFormFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicStates - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicStates + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Status == 0 { requestData.Status = 2 } @@ -344,12 +402,24 @@ func (a *ApiMethod) OpenFormFlow(c *gin.Context) { # */ func (a *ApiMethod) AnalysisForm(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AnalysisNodesUnitPower - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AnalysisNodesUnitPower + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.NodeKey == "" { requestData.NodeKey = "begin" } @@ -784,8 +854,19 @@ func (r *RecursionFormUnit) CalculateNodePower(key string) (isLook, isErit bool) # */ func (a *ApiMethod) SetFlowFormKeyPower(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData FlowFormPowerInfo - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData FlowFormPowerInfo + // c.ShouldBindJSON(&requestData) if requestData.FormKey == "" && requestData.FormVersion == "" { publicmethod.Result(106, requestData, c) return @@ -795,7 +876,7 @@ func (a *ApiMethod) SetFlowFormKeyPower(c *gin.Context) { return } var customerFormInfo modelAppPlatform.CustomerForm - err := customerFormInfo.GetCont(map[string]interface{}{"`id`": requestData.FormKey}, "`tablename`") + err = customerFormInfo.GetCont(map[string]interface{}{"`id`": requestData.FormKey}, "`tablename`") if err != nil { publicmethod.Result(106, err, c) return @@ -858,12 +939,24 @@ func (a *ApiMethod) SetFlowFormKeyPower(c *gin.Context) { # */ func (a *ApiMethod) GainOrgOfPeopleNodeFactor(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { + err = json.Unmarshal(dataVal, &requestData) + if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(100, err, c) + // return + // } var customerFormCont modelAppPlatform.CustomerForm err = customerFormCont.GetCont(map[string]interface{}{"`id`": requestData.Id}, "`tablename`") if err != nil { diff --git a/api/version1/taskplatform/taskmanagement/appform.go b/api/version1/taskplatform/taskmanagement/appform.go index 90f3ca3..1f39620 100644 --- a/api/version1/taskplatform/taskmanagement/appform.go +++ b/api/version1/taskplatform/taskmanagement/appform.go @@ -34,12 +34,24 @@ import ( # */ func (a *ApiMethod) AppFormDataLog(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData AppFormDataLogStruct - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData AppFormDataLogStruct + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } @@ -107,12 +119,23 @@ func (a *ApiMethod) AppFormDataLog(c *gin.Context) { # */ func (a *ApiMethod) GainTaskList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData GainTaskListStruct - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData GainTaskListStruct + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } @@ -197,12 +220,24 @@ func (a *ApiMethod) GainTaskList(c *gin.Context) { # */ func (a *ApiMethod) GianTaskVersionCont(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(107, err, c) return @@ -669,12 +704,24 @@ func (a *ApiMethod) LookCustomerFormData(c *gin.Context) { # */ func (a *ApiMethod) LookNewCustomerFormData(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知表单参数！请核对1后重新提交!") return @@ -1101,12 +1148,23 @@ func EditWriteSunDatabase(uuid, creater, createrOrgId, createrPositon, createrTi # */ func (a *ApiMethod) DelCustomerFormDataLog(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.CommonId[string] - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.CommonId[string] + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(1, err, c, "未知数据") return diff --git a/api/version1/taskplatform/taskmanagement/formcontrol.go b/api/version1/taskplatform/taskmanagement/formcontrol.go index baf65a3..386d4d3 100644 --- a/api/version1/taskplatform/taskmanagement/formcontrol.go +++ b/api/version1/taskplatform/taskmanagement/formcontrol.go @@ -1943,12 +1943,24 @@ func WriteSunDatabaseSoucer(sqlDb *gorm.DB, uuid, creater, userOrg, userPositon, # */ func (a *ApiMethod) RecalSendMsg(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) - if err != nil || requestData.Id == "" { - publicmethod.Result(10001, err, c) + err = json.Unmarshal(dataVal, &requestData) + if err != nil { + publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil || requestData.Id == "" { + // publicmethod.Result(10001, err, c) + // return + // } redisKey := fmt.Sprintf("SendMsg:Work_WeChat_%v", requestData.Id) redisClient := grocerystore.RunRedis(overall.CONSTANT_REDIS3) isTrue, msgId := redisClient.Get(redisKey) diff --git a/api/version1/taskplatform/taskmanagement/ruanTask.go b/api/version1/taskplatform/taskmanagement/ruanTask.go index 0d63e16..47af43f 100644 --- a/api/version1/taskplatform/taskmanagement/ruanTask.go +++ b/api/version1/taskplatform/taskmanagement/ruanTask.go @@ -40,12 +40,23 @@ import ( # */ func (a *ApiMethod) GainTaskFormInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData LookFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData LookFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -512,12 +523,23 @@ func ChuLiMasterTableData(key string, val interface{}, unitCont []customerform.U # */ func (a *ApiMethod) SoftDeletion(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData BatchDeleteClass - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData BatchDeleteClass + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if len(requestData.Id) < 1 { publicmethod.Result(100, err, c) return @@ -1142,12 +1164,23 @@ func MasterTableHandle(tableName string, creater, cureeTime int64, newsData map[ # */ func (a *ApiMethod) GainEditDataLog(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -1419,8 +1452,20 @@ func AnalysisMsaterLog(dataStr string, nameKey []customerform.UnitAttribute) (se # */ func (a *ApiMethod) EchoTableFormPage(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SimTask - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData SimTask + // err := c.ShouldBindJSON(&requestData) // if err != nil { // publicmethod.Result(100, err, c) // return @@ -2704,8 +2749,19 @@ func TransformPublicUs(v modelshr.ManCont) (userCont OperatorList) { # */ func (a *ApiMethod) RealTimeUpdateFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData CreatFlowView - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData CreatFlowView + // err := c.ShouldBindJSON(&requestData) // if err != nil { // publicmethod.Result(10001, err, c) // return @@ -2807,12 +2863,24 @@ func SlicingAndDeduplication(new, old []OperatorList) (mapAry []OperatorList) { # */ func (a *ApiMethod) RetractRunWorkFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return diff --git a/api/version1/taskplatform/taskmanagement/runTaskFlow.go b/api/version1/taskplatform/taskmanagement/runTaskFlow.go index d940624..5141fdd 100644 --- a/api/version1/taskplatform/taskmanagement/runTaskFlow.go +++ b/api/version1/taskplatform/taskmanagement/runTaskFlow.go @@ -36,12 +36,23 @@ import ( # */ func (a *ApiMethod) RunTaskFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SubmitAppResults - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SubmitAppResults + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -336,12 +347,24 @@ func (r *RunWorkFlow) RunNodeHandle(userKey int64, AgreeToRefuse int, Suggest st # */ func (a *ApiMethod) GainEditDataNewLog(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c) + publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(200, err, c) return @@ -939,12 +962,24 @@ func HistoryValueHand(field string, val interface{}, nameKey []customerform.Unit # */ func (a *ApiMethod) GainWebTaskFlowInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return diff --git a/api/version1/taskplatform/taskmanagement/runWorkFlow.go b/api/version1/taskplatform/taskmanagement/runWorkFlow.go index 8ac228f..b687be4 100644 --- a/api/version1/taskplatform/taskmanagement/runWorkFlow.go +++ b/api/version1/taskplatform/taskmanagement/runWorkFlow.go @@ -35,12 +35,24 @@ import ( # */ func (a *ApiMethod) StartRunWorkFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData StartWorkFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c, "未知进程！不可执行") + publicmethod.Result(100, err, c) return } + + // var requestData StartWorkFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c, "未知进程！不可执行") + // return + // } var taskInfo customerForm.TaskRecord if requestData.Id == "" { //获取当前任务内容 @@ -578,12 +590,23 @@ func PaceStep(runId int64, step, totalSteps int, nodeInfo RunFlow) (currentStep, # */ func (a *ApiMethod) DraftsInitiateApproval(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData StartWorkFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData StartWorkFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c, "未知进程！不可执行") return @@ -678,12 +701,24 @@ func (a *ApiMethod) DraftsInitiateApproval(c *gin.Context) { # */ func (a *ApiMethod) GainRunTaskWorkflow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(200, err, c) + publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(200, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(200, err, c) return @@ -973,12 +1008,24 @@ func ApprovalInSequence(Operator []OperatorList, userCont modelshr.ManCont) bool # */ func (a *ApiMethod) AfreshRunWorkflow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -1249,12 +1296,24 @@ func (a *ApiMethod) ApplyForTableFormData(c *gin.Context) { # */ func (a *ApiMethod) AuthorizeWorkflow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SubmitAppResults - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData SubmitAppResults + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return @@ -1729,12 +1788,23 @@ func JudgeOperUser(userKey, runId int64, Operator []OperatorList) (bool, string) # */ func (a *ApiMethod) GainRunFlowStart(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(107, err, c) return diff --git a/api/version1/user/setPower.go b/api/version1/user/setPower.go index 62278e2..dbe5ce4 100644 --- a/api/version1/user/setPower.go +++ b/api/version1/user/setPower.go @@ -40,12 +40,15 @@ func GetMyPower(powerType, role string, oupk, org, poetId int64) (allPower SendA } if v.ButPower != "" && v.ButPower != "null" { json.Unmarshal([]byte(v.ButPower), &sysPower.ButIdAry) + var butPowMenus []string + json.Unmarshal([]byte(v.ButPower), &butPowMenus) + allPower.MenuButIdAry = append(allPower.MenuButIdAry, butPowMenus...) } sysPower.Scope = v.VisibleRange if v.VisibleRange == 5 && v.ButPower != "" && v.ButPower != "null" { json.Unmarshal([]byte(v.VisibleOrg), &sysPower.ScopeManAry) } - allPower.MenuButIdAry = append(allPower.MenuButIdAry, v.ButPower) + // allPower.MenuButIdAry = append(allPower.MenuButIdAry, v.ButPower) allPower.SystemPower = append(allPower.SystemPower, sysPower) } } else { diff --git a/api/version1/user/userCont.go b/api/version1/user/userCont.go index 00699fb..7234e36 100644 --- a/api/version1/user/userCont.go +++ b/api/version1/user/userCont.go @@ -283,12 +283,23 @@ func GetUserPower(appType string, postId int64, roleList []string) (menuPoint, o # */ func (a *ApiMethod) StatisticalAgeRatio(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { requestData.Id = "309" } @@ -492,12 +503,23 @@ func (a *ApiMethod) StatisticalAgeRatio(c *gin.Context) { # */ func (a *ApiMethod) LookOnePeopleArchives(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData LookOneMan - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData LookOneMan + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } var sendData SendPower sendData.IsOk = 2 if requestData.SurveyMan == "" { @@ -577,12 +599,23 @@ func (a *ApiMethod) LookOnePeopleArchives(c *gin.Context) { # */ func (a *ApiMethod) GainUserInfoDownTemplateList(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PagesTurn - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData publicmethod.PagesTurn + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Page == 0 { requestData.Page = 1 } @@ -636,12 +669,23 @@ func (a *ApiMethod) GainUserInfoDownTemplateList(c *gin.Context) { # */ func (a *ApiMethod) UploadUserTemplate(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData UpLoadTemSave - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData UpLoadTemSave + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.OrgId == "" || requestData.OrgId == "0" { publicmethod.Result(1, err, c, "未知行政组织！不可上传模版") return @@ -684,12 +728,24 @@ func (a *ApiMethod) UploadUserTemplate(c *gin.Context) { # */ func (a *ApiMethod) EditUserTempr(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicStates - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicStates + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" || requestData.Id == "0" { publicmethod.Result(1, err, c, "未知行政组织！不可编辑") return @@ -727,12 +783,24 @@ func (a *ApiMethod) EditUserTempr(c *gin.Context) { # */ func (a *ApiMethod) GainUserTemplateInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" || requestData.Id == "0" { publicmethod.Result(1, err, c, "未知行政组织！不可编辑") return @@ -774,12 +842,24 @@ func (a *ApiMethod) GainUserTemplateInfo(c *gin.Context) { # */ func (a *ApiMethod) EditUserTemplateInfo(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData EditTemplateCont - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData EditTemplateCont + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" || requestData.Id == "0" { publicmethod.Result(1, err, c, "未知行政组织！不可编辑") return @@ -893,8 +973,19 @@ func (a *ApiMethod) GainRoleList(c *gin.Context) { # */ func (a *ApiMethod) GainPickPost(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + // var requestData publicmethod.PublicId + // c.ShouldBindJSON(&requestData) var orgList []modelshr.AdministrativeOrganization gormDb := overall.CONSTANT_DB_HR.Where("`state` = 1") @@ -1027,8 +1118,20 @@ func OrgPostTree(parentId string, postMap []SendPostUnit) (menusTree []SendPostU # */ func (a *ApiMethod) GainOegAndPeople(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData publicmethod.PublicId - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData publicmethod.PublicId + // err := c.ShouldBindJSON(&requestData) if err != nil || requestData.Id == "0" || requestData.Id == "" { context, _ := c.Get(overall.MyContJwt) var userCont modelshr.ManCont diff --git a/api/version1/workFlowRun/flow.go b/api/version1/workFlowRun/flow.go index f4a01ad..09d953d 100644 --- a/api/version1/workFlowRun/flow.go +++ b/api/version1/workFlowRun/flow.go @@ -34,12 +34,23 @@ import ( # */ func (a *ApiMethod) StartProcess(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData StartWorkFlow - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { - publicmethod.Result(10001, err, c, "未知进程！不可执行") + publicmethod.Result(100, err, c) return } + // var requestData StartWorkFlow + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(10001, err, c, "未知进程！不可执行") + // return + // } if requestData.Id == "" { publicmethod.Result(10001, err, c, "未知进程！不可执行") return @@ -159,12 +170,23 @@ func (a *ApiMethod) StartProcess(c *gin.Context) { # */ func (a *ApiMethod) RunTaskWorkFlow(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SubmitAppResults - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + // var requestData SubmitAppResults + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } if requestData.Id == "" { publicmethod.Result(100, err, c) return diff --git a/api/version1/workWechat/sendMsg.go b/api/version1/workWechat/sendMsg.go index 5e6e641..96e61b2 100644 --- a/api/version1/workWechat/sendMsg.go +++ b/api/version1/workWechat/sendMsg.go @@ -31,8 +31,20 @@ import ( # */ func (a *ApiMethod) SendMsg(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData SendMessage - c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } + + // var requestData SendMessage + // c.ShouldBindJSON(&requestData) // var sendText SendMessage // sendText.Touser = "KaiXinGuo" // sendText.Msgtype = "template_card" diff --git a/api/version1/workWechat/wechat.go b/api/version1/workWechat/wechat.go index 92c250a..8dc5297 100644 --- a/api/version1/workWechat/wechat.go +++ b/api/version1/workWechat/wechat.go @@ -135,12 +135,24 @@ func getWechatServer(companyId, secretStr string) (token string, err error) { # */ func (a *ApiMethod) LookOnePeopleArchives(c *gin.Context) { + dataVal, err := publicmethod.ReceiveData(c) //接收数据处理 + if err != nil { + publicmethod.Result(100, err, c) + return + } var requestData LookOneMan - err := c.ShouldBindJSON(&requestData) + err = json.Unmarshal(dataVal, &requestData) if err != nil { publicmethod.Result(100, err, c) return } + + // var requestData LookOneMan + // err := c.ShouldBindJSON(&requestData) + // if err != nil { + // publicmethod.Result(100, err, c) + // return + // } var sendData SendPower sendData.IsOk = 2 if requestData.SurveyMan == "" { diff --git a/config/configApp/appConfig.yaml b/config/configApp/appConfig.yaml index 0f863c1..88c7bf0 100644 --- a/config/configApp/appConfig.yaml +++ b/config/configApp/appConfig.yaml @@ -11,6 +11,9 @@ appsetup: pcurl: 'http://ginadmin.hxgk.group' #PC访问地址 webKpiUrl: 'https://wab.hxgk.group' #web访问地址 defaultIP: '127.0.0.1' # + sm4Token: '04TzMuvkHm_EZnHm' + openSm4 : true + sm4Key: 'hengxingaokeApp1' logconfig: path: 'log' #日志保存地址 #验证码相关设置 diff --git a/config/configApp/server.go b/config/configApp/server.go index d51c9ed..e2270af 100644 --- a/config/configApp/server.go +++ b/config/configApp/server.go @@ -24,6 +24,9 @@ type appsetup struct { PcbUrl string `mapstructure:"pcurl" json:"pcurl" yaml:"pcurl"` WebKpiUrl string `mapstructure:"webKpiUrl" json:"webKpiUrl" yaml:"webKpiUrl"` DefaultIP string `mapstructure:"defaultIP" json:"defaultIP" yaml:"defaultIP"` + Sm4Token string `mapstructure:"sm4Token" json:"sm4Token" yaml:"sm4Token"` + OpenSm4 bool `mapstructure:"openSm4" json:"openSm4" yaml:"openSm4"` + Sm4Key string `mapstructure:"sm4Key" json:"sm4Key" yaml:"sm4Key"` } //日志配置 diff --git a/overall/publicmethod/formatOutput.go b/overall/publicmethod/formatOutput.go index e1939e1..8c61268 100644 --- a/overall/publicmethod/formatOutput.go +++ b/overall/publicmethod/formatOutput.go @@ -32,7 +32,23 @@ func Result(code int, data interface{}, c *gin.Context, msgAry ...string) { } } - c.JSON(http.StatusOK, Reply{code, msg, data}) //输出json格式数据 + if overall.CONSTANT_CONFIG.Appsetup.OpenSm4 { + dataJson, errJson := json.Marshal(data) + if errJson != nil { + c.JSON(http.StatusOK, Reply{code, msg, data}) //输出json格式数据 + } else { + jiaMi, sm4RandKey, err := SM4EncryptNew(string(dataJson), 0) + if err != nil { + c.JSON(http.StatusOK, Reply{code, msg, data}) //输出json格式数据 + } else { + c.Header("Auth-key", sm4RandKey) + c.JSON(http.StatusOK, Reply{code, msg, jiaMi}) //输出json格式数据 + } + } + } else { + c.JSON(http.StatusOK, Reply{code, msg, data}) //输出json格式数据 + } + } // 格式化输出 @@ -235,3 +251,36 @@ func DetermineUserIdentity(userKey int64) (identity outShenFen) { } return } + +/* +* +@ 作者: 秦东 +@ 时间: 2025-12-11 21:48:22 +@ 功能: 接收参数解析 +*/ +func ReceiveData(c *gin.Context) ([]byte, error) { + var err error + var val interface{} + if overall.CONSTANT_CONFIG.Appsetup.OpenSm4 { + var dataCont ReceiveSm4Parameter + err = c.ShouldBindJSON(&dataCont) + if err != nil { + return json.Marshal(dataCont) + } + Sm4token := c.Request.Header.Get("Auth-key") + SM4Iv := overall.CONSTANT_CONFIG.Appsetup.Sm4Token + if Sm4token != "" { + SM4Iv = Sm4token + } + sm4Iv16 := ProcessString(SM4Iv, 16, "s") + jieMi, err := SM4DecryptNew(dataCont.EncryptedFile, sm4Iv16) + if err != nil { + return json.Marshal(val) + } + return jieMi, err + } else { + c.ShouldBindJSON(&val) + return json.Marshal(val) + } + return json.Marshal(val) +} diff --git a/overall/publicmethod/newSm4.go b/overall/publicmethod/newSm4.go new file mode 100644 index 0000000..f8149ea --- /dev/null +++ b/overall/publicmethod/newSm4.go @@ -0,0 +1,129 @@ +package publicmethod + +import ( + "appPlatform/overall" + "crypto/cipher" + "encoding/hex" + "strings" + + "github.com/tjfoc/gmsm/sm4" +) + +// 判断字符串长度，多余的删除，不足的补充 +func ProcessString(s string, length int, pad string) string { + // 如果字符串长度已经符合要求，直接返回 + if len(s) == length { + return s + } + + // 如果字符串长度超过了要求，截取指定长度的部分 + if len(s) > length { + return s[:length] + } + + // 如果字符串长度不足，使用pad字符串进行补充 + return s + padString(pad, length-len(s)) +} + +// 获取加密随机安全码 +func getSm4IvRandString(length int) (sm4Iv string) { + for { + sm4IvStr, err := GenerateRandomString(length) + if err == nil { + sm4Iv = sm4IvStr + break + } + } + return + +} + +/* +* +@ 作者: 秦东 +@ 时间: 2026-01-20 14:38:09 +@ 功能: SM4加密方法 +@ 参数 + + #data 要加密的字符 + #key 附加选项 + +@ 返回值 + + #加密后的字符 + #error +*/ +func SM4EncryptNew(data string, class int, key ...string) (string, string, error) { + SM4Key := overall.CONSTANT_CONFIG.Appsetup.Sm4Key + if len(key) > 0 { + SM4Key = strings.Join(key, "-") + } + SM4Key = ProcessString(SM4Key, 16, "s") + //字符串转byte切片 + plainText := []byte(data) + SM4Iv := getSm4IvRandString(16) + if class == 1 { + SM4Iv = overall.CONSTANT_CONFIG.Appsetup.Sm4Token + } + sm4Iv16 := ProcessString(SM4Iv, 16, "s") + iv := []byte(sm4Iv16) + keySm4 := []byte(SM4Key) + //实例化sm4加密对象 + block, err := sm4.NewCipher(keySm4) + if err != nil { + return "1", SM4Iv, err + } + //明文数据填充 + paddingData := paddingLastGroup(plainText, block.BlockSize()) + //声明SM4的加密工作模式 + blockMode := cipher.NewCBCEncrypter(block, iv) + //为填充后的数据进行加密处理 + cipherText := make([]byte, len(paddingData)) + //使用CryptBlocks这个核心方法，将paddingData进行加密处理，将加密处理后的值赋值到cipherText中 + blockMode.CryptBlocks(cipherText, paddingData) + //加密结果使用hex转成字符串，方便外部调用 + cipherString := hex.EncodeToString(cipherText) + return cipherString, SM4Iv, nil +} + +/* +* +@ 作者: 秦东 +@ 时间: 2026-01-20 14:44:50 +@ 功能: SM4解密新版 +*/ +func SM4DecryptNew(data, sm4IvStr string, key ...string) ([]byte, error) { + SM4Key := overall.CONSTANT_CONFIG.Appsetup.Sm4Key + if len(key) > 0 { + SM4Key = strings.Join(key, "-") + } + if len(key) > 0 { + SM4Key = strings.Join(key, "-") + } + SM4Key = ProcessString(SM4Key, 16, "s") + //sm4随机安全码 + SM4Iv := overall.CONSTANT_CONFIG.Appsetup.Sm4Token + if sm4IvStr != "" { + SM4Iv = sm4IvStr + } + sm4Iv16 := ProcessString(SM4Iv, 16, "s") + iv := []byte(sm4Iv16) + keySm4 := []byte(SM4Key) + block, err := sm4.NewCipher(keySm4) + if err != nil { + return []byte(""), err + } + //使用hex解码 + decodeString, err := hex.DecodeString(data) + if err != nil { + return []byte(""), err + } + //CBC模式 优点：具有较好的安全性，能够隐藏明文的模式和重复性。 缺点：加密过程是串行的，不适合并行处理。 + blockMode := cipher.NewCBCDecrypter(block, iv) + //下文有详解这段代码的含义 + blockMode.CryptBlocks(decodeString, decodeString) + //去掉明文后面的填充数据 + plainText := unPaddingLastGroup(decodeString) + + return plainText, nil +} diff --git a/overall/publicmethod/randString.go b/overall/publicmethod/randString.go new file mode 100644 index 0000000..282e228 --- /dev/null +++ b/overall/publicmethod/randString.go @@ -0,0 +1,43 @@ +package publicmethod + +import ( + "fmt" + "math/rand" + "time" +) + +/* +* +@ 作者: 秦东 +@ 时间: 2025-12-06 11:05:40 +@ 功能: 随机字符串 +*/ +func GenerateRandomString(length int) (string, error) { + if length <= 0 { + return "", fmt.Errorf("长度必须大于0") + } + + // 定义所有可能的字符：数字0-9，大写字母A-Z，小写字母a-z + allChars := "123456789ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnpqrstuvwxyz" + allCharsLen := len(allChars) + + // 检查请求的长度是否超过可用字符数 + if length > allCharsLen { + return "", fmt.Errorf("请求的长度(%d)超过了可用字符总数(%d)", length, allCharsLen) + } + + // 将字符串转换为字节切片以便随机选择 + chars := []byte(allChars) + + // 使用当前时间作为随机种子 + rand.Seed(time.Now().UnixNano()) + + // 随机打乱字符顺序 + rand.Shuffle(allCharsLen, func(i, j int) { + chars[i], chars[j] = chars[j], chars[i] + }) + + // 取前length个字符作为结果 + result := string(chars[:length]) + return result, nil +} diff --git a/overall/publicmethod/sm4.go b/overall/publicmethod/sm4.go index 5471218..184ea00 100644 --- a/overall/publicmethod/sm4.go +++ b/overall/publicmethod/sm4.go @@ -29,7 +29,7 @@ import ( # */ func SM4Encrypt(data string, key ...string) (string, error) { - SM4Key := overall.CONSTANT_CONFIG.Appsetup.AppKey + SM4Key := overall.CONSTANT_CONFIG.Appsetup.Sm4Key if len(key) > 0 { SM4Key = strings.Join(key, "-") } @@ -101,7 +101,7 @@ func unPaddingLastGroup(plainText []byte) []byte { # */ func SM4Decrypt(data string, key ...string) ([]byte, error) { - SM4Key := overall.CONSTANT_CONFIG.Appsetup.AppKey + SM4Key := overall.CONSTANT_CONFIG.Appsetup.Sm4Key if len(key) > 0 { SM4Key = strings.Join(key, "-") } diff --git a/overall/publicmethod/type.go b/overall/publicmethod/type.go index cf28c7b..63964c9 100644 --- a/overall/publicmethod/type.go +++ b/overall/publicmethod/type.go @@ -469,3 +469,13 @@ type SendAllPowers struct { AppGroupMenu []string `json:"appGroupMenu"` //自定义分组菜单 Level int64 `json:"level"` //等级 } + +/* +* +@ 作者: 秦东 +@ 时间: 2025-12-11 21:55:12 +@ 功能: 接收SM4加密参数 +*/ +type ReceiveSm4Parameter struct { + EncryptedFile string `json:"data"` +}