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

加密

qin_v3
herenshan112 5 days ago
parent
e1a955b09c
commit
efe1e888aa
26 changed files with 699 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      api/authentication/creatToke.go
  2. 13
      api/shiyan/maptostruct/shiyan.go
  3. 36
      api/version1/customerApp/companyduty.go
  4. 2
      api/version1/customerApp/runAppControll.go
  5. 14
      api/version1/customerApp/type.go
  6. 15
      api/version1/customerform/calendarData.go
  7. 102
      api/version1/customerform/codeFormGroup.go
  8. 81
      api/version1/customerform/datatable.go
  9. 170
      api/version1/customerform/form.go
  10. 91
      api/version1/customerform/formTable.go
  11. 26
      api/version1/customerform/formTableList.go
  12. 28
      api/version1/customerform/formTableView.go
  13. 45
      api/version1/customerform/fromPrintTemplate.go
  14. 14
      api/version1/customerform/tableList.go
  15. 8
      api/version1/newsclass/newsapi.go
  16. 14
      api/version1/taskplatform/taskflowing/appTaskFlow.go
  17. 8
      api/version1/taskplatform/taskflowing/editformflow.go
  18. 7
      api/version1/taskplatform/taskmanagement/appControl.go
  19. 21
      api/version1/taskplatform/taskmanagement/appform.go
  20. 27
      api/version1/taskplatform/taskmanagement/formcontrol.go
  21. 10
      api/version1/taskplatform/taskmanagement/ruanTask.go
  22. 7
      api/version1/taskplatform/taskmanagement/runWorkFlow.go
  23. 10
      api/version1/workFlowRun/common.go
  24. 14
      overall/publicmethod/formatOutput.go
  25. 13
      overall/publicmethod/newSm4.go
  26. 6
      overall/publicmethod/sm4.go

1
api/authentication/creatToke.go
View File

@ -24,6 +24,7 @@ func (a *ApiMethod) HaveMyCode(c *gin.Context) {
publicmethod.Result(100, err, c)
return
}
fmt.Printf("\n\n获取身份----->%v\n\n", string(dataVal))
var requestData publicmethod.CommonId[string]
err = json.Unmarshal(dataVal, &requestData)
if err != nil {

13
api/shiyan/maptostruct/shiyan.go
View File

@ -603,12 +603,23 @@ func (a *ApiMethod) GainDateCenter(c *gin.Context) {
}
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

36
api/version1/customerApp/companyduty.go
View File

@ -33,7 +33,9 @@ func (a *ApiMethod) CompanyDutyInit(c *gin.Context) {
if userCont.Company == 402 {
userCont.Company = 296
}
var sendInfo PageInit
sendData["currentOrg"] = userCont.Company
sendInfo.CurrentOrg = userCont.Company
var orgCurre modelshr.AdministrativeOrganization
orgCurre.GetCont(map[string]interface{}{"`id`": userCont.Company}, "`name`")
currentTime := time.Now().Unix()
@ -48,6 +50,14 @@ func (a *ApiMethod) CompanyDutyInit(c *gin.Context) {
sendData["month"] = monthValInt
sendData["currentOrgName"] = orgCurre.Name
sendData["currentTime"] = time.Now().Unix() * 1000
sendInfo.Title = fmt.Sprintf("%v.%v.%v%v值班表", yearVal, monthVal, currentDay, orgCurre.Name)
sendInfo.TitlePc = fmt.Sprintf("%v年%v月%v值班表", yearVal, monthVal, orgCurre.Name)
sendInfo.Year = yearValInt
sendInfo.Month = monthValInt
sendInfo.CurrentOrgName = orgCurre.Name
sendInfo.CurrentTime = time.Now().Unix() * 1000
endTime := publicmethod.GetDaysInMonth(yearValInt, monthValInt)
monthEndDay, _ := strconv.Atoi(endTime.Days)
var monthAllDay []string
@ -55,46 +65,64 @@ func (a *ApiMethod) CompanyDutyInit(c *gin.Context) {
monthAllDay = append(monthAllDay, fmt.Sprintf("%v日", i))
}
myPower := publicmethod.GetMyMenuPower(userCont.Key, "38")
//角色权限范围判定
//1：本岗位；2：本部门；3：本分部；4：指定行政组织；5：所有
switch SearchRoleLevev(userCont.Role) {
// switch SearchRoleLevev(userCont.Role) {
switch myPower.Scope {
case 5:
sendData["orgLevel"] = 5
sendInfo.OrgLevel = 5
// sendData["orgList"] = GetOrgLevel(313, 1)
case 4:
sendData["orgLevel"] = 4
sendInfo.OrgLevel = 4
// sendData["orgList"] = GetOrgLevel(userCont.Company, 1)
case 3:
sendData["orgLevel"] = 3
sendInfo.OrgLevel = 3
// sendData["orgList"] = GetOrgLevel(userCont.MainDeparment, 2)
case 2:
sendData["orgLevel"] = 2
sendInfo.OrgLevel = 2
// sendData["orgList"] = GetOrgLevel(userCont.MainDeparment, 2)
case 1:
sendData["orgLevel"] = 1
sendInfo.OrgLevel = 1
// sendData["orgList"] = GetOrgLevel(userCont.MainDeparment, 2)
case 6:
sendData["orgLevel"] = 6
sendInfo.OrgLevel = 6
// sendData["orgList"] = GetOrgLevel(userCont.MainDeparment, 2)
default:
}
sendData["orgList"] = GetOrgLevel(313, 1)
orgList := GetOrgLevel(312, 2)
sendData["orgList"] = orgList
sendInfo.OrgList = orgList
sendData["currentDay"] = currentDay
sendInfo.CurrentDay = currentDay
// sendData["endTime"] = endTime
sendData["monthAllDay"] = monthAllDay
sendInfo.MonthAllDay = monthAllDay
publicmethod.Result(0, sendData, c)
}
// 获取行政组织层级
func GetOrgLevel(partenId int64, types int) (orgList []GaveOrgAry) {
gormDb := overall.CONSTANT_DB_HR.Model(&GaveOrgAry{}).Where("`state` = 1")
gormDb := overall.CONSTANT_DB_HR.Model(&GaveOrgAry{}).Where("`state` IN ? ", []int{1, 2})
if types == 1 {
gormDb = gormDb.Where("`superior` = ?", partenId)
} else if types == 2 {
gormDb = gormDb.Where("`id` IN ?", []int{296, 389, 401, 309})
} else {
gormDb = gormDb.Where("`id` = ?", partenId)
}
gormDb.Order("`sort` ASC").Find(&orgList)
sort.Slice(orgList, func(i, j int) bool {
return orgList[i].Sort < orgList[j].Sort
})
return
}

2
api/version1/customerApp/runAppControll.go
View File

@ -486,6 +486,7 @@ 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)
@ -497,6 +498,7 @@ func (a *ApiMethod) GetAppList(c *gin.Context) {
publicmethod.Result(100, err, c)
return
}
// var requestData publicmethod.PublicId
// err := c.ShouldBindJSON(&requestData)
// if err != nil {

14
api/version1/customerApp/type.go
View File

@ -707,3 +707,17 @@ type apiSetupStruct struct {
Title []interface{} `json:"title"`
Library []interface{} `json:"library"`
}
type PageInit struct {
CurrentOrg int64 `json:"currentOrg"`
Title string `json:"title"`
TitlePc string `json:"titlePc"`
Year int `json:"year"`
Month int `json:"month"`
CurrentOrgName string `json:"currentOrgName"`
CurrentTime int64 `json:"currentTime"`
OrgLevel int `json:"orgLevel"`
OrgList []GaveOrgAry `json:"orgList"`
CurrentDay int `json:"currentDay"`
MonthAllDay []string `json:"monthAllDay"`
}

15
api/version1/customerform/calendarData.go
View File

@ -32,8 +32,19 @@ import (
#
*/
func (a *ApiMethod) CalendarDataList(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData CalendarSearch
c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
// var requestData CalendarSearch
// c.ShouldBindJSON(&requestData)
if len(requestData.TimeAry) < 1 && len(requestData.TimeMonthAry) < 1 {
publicmethod.Result(1, requestData, c, "未知日期！无法获取字段！2")
@ -58,7 +69,7 @@ func (a *ApiMethod) CalendarDataList(c *gin.Context) {
userCont.GetLoginCont(context)
//Step3:获取当前信息表单咨询
var formInfo modelAppPlatform.CustomerFormView
err := formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.Search.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`")
err = formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.Search.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`")
if err != nil {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！")
return

102
api/version1/customerform/codeFormGroup.go
View File

@ -4,6 +4,7 @@ import (
"appPlatform/models/modelAppPlatform"
"appPlatform/overall"
"appPlatform/overall/publicmethod"
"encoding/json"
"sort"
"strconv"
"time"
@ -29,8 +30,19 @@ import (
#
*/
func (a *ApiMethod) CustomerFormGroupTree(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData FormGroupArg
c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
// var requestData FormGroupArg
// c.ShouldBindJSON(&requestData)
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
@ -61,7 +73,7 @@ func (a *ApiMethod) CustomerFormGroupTree(c *gin.Context) {
}
}
err := gormDb.Order("`sort` DESC").Find(&groupList).Error
err = gormDb.Order("`sort` DESC").Find(&groupList).Error
if err != nil {
publicmethod.Result(106, err, c)
return
@ -101,11 +113,22 @@ func (a *ApiMethod) CustomerFormGroupTree(c *gin.Context) {
#
*/
func (a *ApiMethod) CustomerFormGroupList(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData FormGroupArgList
c.ShouldBindJSON(&requestData)
if requestData.Page == 0 {
requestData.Page = 1
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData FormGroupArgList
// c.ShouldBindJSON(&requestData)
// if requestData.Page == 0 {
// requestData.Page = 1
// }
if requestData.PageSize == 0 {
requestData.PageSize = 15
}
@ -139,7 +162,7 @@ func (a *ApiMethod) CustomerFormGroupList(c *gin.Context) {
total = 0
}
gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize)
err := gormDb.Order("`sort` ASC").Order("`id` DESC").Find(&groupList).Error
err = gormDb.Order("`sort` ASC").Order("`id` DESC").Find(&groupList).Error
if err != nil {
publicmethod.Result(106, err, c)
return
@ -189,12 +212,24 @@ func (a *ApiMethod) CustomerFormGroupList(c *gin.Context) {
#
*/
func (a *ApiMethod) AddCustomerFormGroup(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData AddFormGroup
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData AddFormGroup
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Title == "" {
publicmethod.Result(101, err, c)
return
@ -258,12 +293,23 @@ func onlyoenUUID(uuId int64) int64 {
#
*/
func (a *ApiMethod) EditCustomerFormGroup(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData EditFormGroup
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData EditFormGroup
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Id == "" {
publicmethod.Result(102, err, c)
return
@ -324,12 +370,24 @@ func (a *ApiMethod) EditCustomerFormGroup(c *gin.Context) {
#
*/
func (a *ApiMethod) EditFormGroupState(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
@ -375,12 +433,23 @@ func (a *ApiMethod) EditFormGroupState(c *gin.Context) {
#
*/
func (a *ApiMethod) DelFormGroup(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
@ -466,12 +535,23 @@ func (a *ApiMethod) DelFormGroup(c *gin.Context) {
#
*/
func (a *ApiMethod) GainFormGroupInfo(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

81
api/version1/customerform/datatable.go
View File

@ -30,12 +30,24 @@ import (
#
*/
func (a *ApiMethod) HaveDataBaseTableStruct(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(101, err, c)
return
@ -184,12 +196,24 @@ func ReadDatabaseForm(tableName string, tableType ...string) (list []Result, err
#
*/
func (a *ApiMethod) HaveFormTabelCont(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData HaveVersionForm
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData HaveVersionForm
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Id == "" {
publicmethod.Result(101, err, c)
return
@ -288,12 +312,24 @@ func (a *ApiMethod) HaveFormTabelCont(c *gin.Context) {
#
*/
func (a *ApiMethod) HaveFormTableList(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(101, err, c)
return
@ -444,12 +480,23 @@ func ComponentMappingDataTableField(list []MasterStruct) (mastSql []string) {
#
*/
func (a *ApiMethod) OptimizeOrRepairFormTable(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData OptimizeOrRepairTable
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData OptimizeOrRepairTable
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Name == "" {
publicmethod.Result(101, err, c)
return
@ -485,12 +532,23 @@ func (a *ApiMethod) OptimizeOrRepairFormTable(c *gin.Context) {
#
*/
func (a *ApiMethod) FormFieldHandle(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData Result
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData Result
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
var sendForm SendFieldCont
sendForm.Field = requestData.Field
sendForm.Type = requestData.Type
@ -547,12 +605,23 @@ func (a *ApiMethod) FormFieldHandle(c *gin.Context) {
#
*/
func (a *ApiMethod) EditFormField(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData EditDatabaseFormField
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData EditDatabaseFormField
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.FormName == "" || requestData.Field == "" {
publicmethod.Result(101, err, c)
return

170
api/version1/customerform/form.go
View File

@ -33,9 +33,20 @@ import (
#
*/
func (a *ApiMethod) CustomerFormList(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData SearchForm
// ersr := c.ShouldBindJSON(&requestData)
c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
// var requestData SearchForm
// // ersr := c.ShouldBindJSON(&requestData)
// c.ShouldBindJSON(&requestData)
if requestData.Page == 0 {
requestData.Page = 1
}
@ -80,7 +91,7 @@ func (a *ApiMethod) CustomerFormList(c *gin.Context) {
total = 0
}
gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize)
err := gormDb.Order("`id` DESC").Find(&formList).Error
err = gormDb.Order("`id` DESC").Find(&formList).Error
if err != nil && len(formList) < 1 {
publicmethod.Result(0, err, c)
return
@ -234,8 +245,19 @@ func HaveCustomerFormCreaterUs(tableKey string) (userCont modelshr.PersonArchive
#
*/
func (a *ApiMethod) ProductionMarkOfCustomerForm(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData AppOrForm
c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData AppOrForm
// c.ShouldBindJSON(&requestData)
formNAme := "customer_form"
switch requestData.Types {
case 1:
@ -294,12 +316,25 @@ func (a *ApiMethod) ProductionMarkOfCustomerForm(c *gin.Context) {
*/
func (a *ApiMethod) SaveCustomerForm(c *gin.Context) {
context, _ := c.Get(overall.MyContJwt)
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData HaveCustomerFormConfig
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData HaveCustomerFormConfig
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Data == "" {
publicmethod.Result(1, err, c, "自定义表单错误！")
return
@ -433,12 +468,24 @@ func HageFormVersionNum(tableKey string) (num int64) {
#
*/
func (a *ApiMethod) LookCustomerForm(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, requestData.Id, c, "未知表单!")
return
@ -531,12 +578,24 @@ func (a *ApiMethod) LookCustomerForm(c *gin.Context) {
#
*/
func (a *ApiMethod) EditCustomerFormStatus(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData EditCustomerFormStatus
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData EditCustomerFormStatus
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if len(requestData.Id) < 1 {
publicmethod.Result(1, err, c, "没有要删除得内容！")
return
@ -584,12 +643,23 @@ func (a *ApiMethod) EditCustomerFormStatus(c *gin.Context) {
#
*/
func (a *ApiMethod) HaveCustomerFormVersion(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
@ -623,12 +693,24 @@ func (a *ApiMethod) HaveCustomerFormVersion(c *gin.Context) {
#
*/
func (a *ApiMethod) SaveSetupCont(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData HaveCustomerFormInfo
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData HaveCustomerFormInfo
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Id == 0 {
publicmethod.Result(1, err, c, "未知设置数据！请检查！")
return
@ -1068,12 +1150,25 @@ func CustomRules(list []CustomRulesStruct) (sqlStr string) {
*/
func (a *ApiMethod) EditCustomerFormInfo(c *gin.Context) {
context, _ := c.Get(overall.MyContJwt)
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData EditCustomerFormCont
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData EditCustomerFormCont
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Id == "" {
publicmethod.Result(1, err, c, "自定义表单错误！")
return
@ -1157,12 +1252,25 @@ func (a *ApiMethod) EditCustomerFormInfo(c *gin.Context) {
*/
func (a *ApiMethod) SaveAsNewVersion(c *gin.Context) {
context, _ := c.Get(overall.MyContJwt)
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData HaveCustomerFormConfig
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData HaveCustomerFormConfig
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Data == "" {
publicmethod.Result(1, err, c, "自定义表单错误！")
return
@ -1253,12 +1361,24 @@ func (a *ApiMethod) SaveAsNewVersion(c *gin.Context) {
#
*/
func (a *ApiMethod) EnableVersion(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
@ -1300,12 +1420,23 @@ func (a *ApiMethod) EnableVersion(c *gin.Context) {
#
*/
func (a *ApiMethod) JudgeSubmitCancel(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, err, c, "未知表单数据！")
return
@ -1424,12 +1555,23 @@ func PublicUnitJieXi(list []MasterStruct) (isSubmit, isCancel bool) {
#
*/
func (a *ApiMethod) SetOftenApp(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.Id, c, "未知App!")
return

91
api/version1/customerform/formTable.go
View File

@ -702,12 +702,23 @@ func (f *FormUnitInfo) GainMasterAndSunFormUnitNameKey() (mastNameKey map[string
#
*/
func (a *ApiMethod) GainTableField(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
@ -768,12 +779,23 @@ func (a *ApiMethod) GainTableField(c *gin.Context) {
#
*/
func (a *ApiMethod) GainFormTableField(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
@ -1279,12 +1301,23 @@ func (f *FormJsonFieldInfo) AnalyzingFormJson(tableName string, unitList []inter
#
*/
func (a *ApiMethod) EditCustomerFormList(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData EditCustFormList
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData EditCustFormList
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.Id == "" {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！2")
return
@ -1333,12 +1366,23 @@ func (a *ApiMethod) EditCustomerFormList(c *gin.Context) {
#
*/
func (a *ApiMethod) GainFormListCont(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, "未知表单！无法获取字段！2")
return
@ -2720,12 +2764,23 @@ func AnalysisSerachTermSql(why string, gormDb *gorm.DB) *gorm.DB {
#
*/
func (a *ApiMethod) GainListTableField(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
@ -2863,12 +2918,23 @@ func (a *ApiMethod) GainListTableField(c *gin.Context) {
#
*/
func (a *ApiMethod) GainListTableFieldTitle(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(103, err, c, "未知表单！无法获取字段！")
return
@ -3028,12 +3094,23 @@ func JudgeUnitTitle(List []MasterStruct) (keyValAry []ViewListMode) {
#
*/
func (a *ApiMethod) GainTableVersionField(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

26
api/version1/customerform/formTableList.go
View File

@ -33,12 +33,23 @@ import (
#
*/
func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData FormPageListAttr
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData FormPageListAttr
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.FormId == "" {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！2")
return
@ -262,12 +273,23 @@ func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) {
@ 功能: 获取当前活跃表格字段
*/
func (a *ApiMethod) GainFormTableFieldes(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

28
api/version1/customerform/formTableView.go
View File

@ -33,8 +33,19 @@ import (
#
*/
func (a *ApiMethod) MultiViewPAge(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData ViewListSearch
c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
// var requestData ViewListSearch
// c.ShouldBindJSON(&requestData)
if requestData.FormId == "" {
publicmethod.Result(1, requestData, c, "未知表单！无法获取字段！2")
return
@ -49,7 +60,7 @@ func (a *ApiMethod) MultiViewPAge(c *gin.Context) {
var userCont modelshr.ManCont
userCont.GetLoginCont(context) //当前操作人
var formInfo modelAppPlatform.CustomerFormView
err := formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`", "`listJsonInfo`", "`signCode`")
err = formInfo.GetCont(map[string]interface{}{"`cfid`": requestData.FormId, "`status`": 1}, "`tablekey`", "`table_structure`", "`mastesform`", "`mastesformjson`", "`listjson`", "`flowIsOpen`", "`flowkey`", "`listJsonInfo`", "`signCode`")
if err != nil {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！")
return
@ -994,12 +1005,23 @@ func AnalysisSerachTermSqlIng(why []SearchButtonInfo, gormDb *gorm.DB) *gorm.DB
#
*/
func (a *ApiMethod) GainFormPageMapCont(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData FormPageListAttr
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData FormPageListAttr
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.FormId == "" {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！2")
return

45
api/version1/customerform/fromPrintTemplate.go
View File

@ -3,6 +3,8 @@ package customerform
import (
"appPlatform/models/modelAppPlatform"
"appPlatform/overall"
"appPlatform/overall/publicmethod"
"encoding/json"
"net/http"
"github.com/gin-gonic/gin"
@ -23,11 +25,22 @@ type TemplateStruct struct {
// 修改模板
func (a *ApiMethod) SaveTemplate(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var req TemplateStruct
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
err = json.Unmarshal(dataVal, &req)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var req TemplateStruct
// if err := c.ShouldBindJSON(&req); err != nil {
// c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
// return
// }
var template modelAppPlatform.PrintTemplate
template.Title = req.Name
template.Type = req.Type
@ -37,34 +50,50 @@ func (a *ApiMethod) SaveTemplate(c *gin.Context) {
template.NodeCheckedList = req.NodeCheckedList
template.PageConfigJson = req.PageConfigJson
err := overall.CONSTANT_DB_AppPlatform.Model(&template).
err = overall.CONSTANT_DB_AppPlatform.Model(&template).
Where("version_id = ? AND form_key = ?", req.VersionId, req.FormKey).
Updates(&template).Error
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
publicmethod.Result(0, err.Error(), c)
return
}
c.JSON(http.StatusOK, gin.H{"code": 200, "msg": "success"})
// c.JSON(http.StatusOK, gin.H{"code": 200, "msg": "success"})
publicmethod.Result(200, "success", c, "success")
}
// 创建或查询模板
func (a *ApiMethod) GetTemplate(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var req TemplateStruct
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
err = json.Unmarshal(dataVal, &req)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var req TemplateStruct
// if err := c.ShouldBindJSON(&req); err != nil {
// c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
// return
// }
var template modelAppPlatform.PrintTemplate
template.VersionId = req.VersionId
template.FormKey = req.FormKey
if err := overall.CONSTANT_DB_AppPlatform.Model(&modelAppPlatform.PrintTemplate{}).
Where("version_id = ? AND form_key = ?", req.VersionId, req.FormKey).
FirstOrCreate(&template).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
// c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
publicmethod.Result(100, err, c)
return
}
c.JSON(http.StatusOK, gin.H{"code": 200, "msg": "success", "data": template})
// c.JSON(http.StatusOK, gin.H{"code": 200, "msg": "success", "data": template})
publicmethod.Result(200, template, c, "success")
}

14
api/version1/customerform/tableList.go
View File

@ -34,12 +34,24 @@ import (
#
*/
func (a *ApiMethod) TableCusterField(c *gin.Context) {
dataVal, err := publicmethod.ReceiveData(c) //接收数据处理
if err != nil {
publicmethod.Result(100, err, c)
return
}
var requestData FormPageListAttr
err := c.ShouldBindJSON(&requestData)
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// var requestData FormPageListAttr
// err := c.ShouldBindJSON(&requestData)
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
if requestData.FormId == "" {
publicmethod.Result(1, err, c, "未知表单！无法获取字段！")
return

8
api/version1/newsclass/newsapi.go
View File

@ -360,10 +360,10 @@ func (a *ApiMethod) NewHotNews(c *gin.Context) {
}
var requestData HosNewsParameter
err = json.Unmarshal(dataVal, &requestData)
if err != nil {
publicmethod.Result(100, err, c)
return
}
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
// var requestData HosNewsParameter
// err := c.ShouldBindJSON(&requestData)
// if err != nil {

14
api/version1/taskplatform/taskflowing/appTaskFlow.go
View File

@ -501,7 +501,12 @@ func (a *ApiMethod) EditTaskAppInfo(c *gin.Context) {
#
*/
func (a *ApiMethod) SaveDraftAgain(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
@ -617,7 +622,12 @@ func (a *ApiMethod) SaveDraftAgain(c *gin.Context) {
#
*/
func (a *ApiMethod) AfreshAppSubmit(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return

8
api/version1/taskplatform/taskflowing/editformflow.go
View File

@ -391,12 +391,16 @@ func (f *FormDataLog) GainFlowFoemLog() {
*/
func (a *ApiMethod) EditFormLogData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
}
mapData := publicmethod.MapOut[string]() //初始化MAP
err = json.Unmarshal(data, &mapData) //将json字符串转换成Map
if err != nil {

7
api/version1/taskplatform/taskmanagement/appControl.go
View File

@ -34,7 +34,12 @@ import (
#
*/
func (a *ApiMethod) CreateAppTask(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return

21
api/version1/taskplatform/taskmanagement/appform.go
View File

@ -299,7 +299,12 @@ func (a *ApiMethod) GianTaskVersionCont(c *gin.Context) {
#
*/
func (a *ApiMethod) CustomerFormAddData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
@ -483,7 +488,12 @@ func WriteDatabase(uuid, creater, createrTime int64, taskCont modelAppPlatform.T
#
*/
func (a *ApiMethod) CustomerFormEditData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
@ -1204,7 +1214,12 @@ func (a *ApiMethod) DelCustomerFormDataLog(c *gin.Context) {
#
*/
func (a *ApiMethod) NewCustomerFormEditData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return

27
api/version1/taskplatform/taskmanagement/formcontrol.go
View File

@ -40,7 +40,12 @@ import (
#
*/
func (a *ApiMethod) AddFormAddData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
@ -504,7 +509,12 @@ func GainFormStruct(formTabelJson string) (master map[string]customerform.Master
#
*/
func (a *ApiMethod) AddFormAddNewData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
@ -795,18 +805,27 @@ func MakeFormMapData(uuid, userKey, userOrg, userPositon, cureeTime int64, field
#
*/
func (a *ApiMethod) AddCustomerForm(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
dataVal, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
}
mapData := publicmethod.MapOut[string]() //初始化MAP
err = json.Unmarshal(data, &mapData) //将接收的json字符串参数转换成Map
err = json.Unmarshal(dataVal, &mapData) //将接收的json字符串参数转换成Map
if err != nil {
publicmethod.Result(100, err, c)
return
}
status := 2
fmt.Printf("\n\n--vmapData------>%v\n\n", mapData)
if _, ok := mapData["formId"]; !ok {
publicmethod.Result(1, err, c, "非法表单！不能提交数据！")
return

10
api/version1/taskplatform/taskmanagement/ruanTask.go
View File

@ -640,12 +640,16 @@ func EditTablePageInfo(masterKey int64, isTrue, state int, tableKey, sunTableStr
#
*/
func (a *ApiMethod) EditCustomerTable(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return
}
mapData := publicmethod.MapOut[string]() //初始化MAP
err = json.Unmarshal(data, &mapData) //将json字符串转换成Map
if err != nil {
@ -1740,7 +1744,7 @@ func ReformFlow(step int, nodeList []RunFlow) (nodeKey string, nextStep int, nod
*/
func (n *NodePublicInfo) CircularParsing(step int, creater modelshr.ManCont, orgId int64, condition []ConditionListInfo, nodelPeople []NodelPeopleInfo) (nodeList []RunFlow) {
fmt.Printf("\n\n\n节点处理---->%v\n\n\n", n)
// fmt.Printf("\n\n\n节点处理---->%v\n\n\n", n)
var nodeInfo RunFlow

7
api/version1/taskplatform/taskmanagement/runWorkFlow.go
View File

@ -1108,7 +1108,12 @@ func (a *ApiMethod) AfreshRunWorkflow(c *gin.Context) {
#
*/
func (a *ApiMethod) ApplyForTableFormData(c *gin.Context) {
data, err := c.GetRawData() //接收表单提交得数据
// data, err := c.GetRawData() //接收表单提交得数据
// if err != nil {
// publicmethod.Result(100, err, c)
// return
// }
data, err := publicmethod.ReceiveData(c)
if err != nil {
publicmethod.Result(100, err, c)
return

10
api/version1/workFlowRun/common.go
View File

@ -814,7 +814,7 @@ func TransformPublicUs(v modelshr.ManCont) (userCont OperatorList) {
#
*/
func (r *RunWorkFlow) RunNodeHandle(userKey int64, AgreeToRefuse int, Suggest string) {
fmt.Printf("执行工作流节点处理------------->userKey=======>%v, AgreeToRefuse=======>%v, Suggest=======>%v, r.Step=======>%v\n", userKey, AgreeToRefuse, Suggest, r.Step)
// fmt.Printf("执行工作流节点处理------------->userKey=======>%v, AgreeToRefuse=======>%v, Suggest=======>%v, r.Step=======>%v\n", userKey, AgreeToRefuse, Suggest, r.Step)
//判断流程是否存在
if len(r.FlowList) < 1 {
return
@ -829,14 +829,14 @@ func (r *RunWorkFlow) RunNodeHandle(userKey int64, AgreeToRefuse int, Suggest st
if r.IsRun {
return
} else {
fmt.Printf("执行工作流节点处理-------1------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n\n", userKey, AgreeToRefuse, Suggest)
// fmt.Printf("执行工作流节点处理-------1------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n\n", userKey, AgreeToRefuse, Suggest)
if AgreeToRefuse != 1 { //驳回操作
v.Status = 3 //驳回
operatorAry, nodeUser := CopeParticipantEnforcerLog(userKeyStr, r.RunUid, 3, v.Operator, Suggest)
r.FlowList[i].Operator = operatorAry
r.Participant = append(r.Participant, nodeUser...)
r.Step, r.NextStep, _ = r.CallBackToNode(v.GoBackNode)
fmt.Printf("执行工作流节点处理--------2----->userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n operatorAry=======>%v\n nodeUser=======>%v\n GoBackNode=======>%v\n r=======>%v\n\n", userKey, AgreeToRefuse, Suggest, operatorAry, nodeUser, v.GoBackNode, r)
// fmt.Printf("执行工作流节点处理--------2----->userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n operatorAry=======>%v\n nodeUser=======>%v\n GoBackNode=======>%v\n r=======>%v\n\n", userKey, AgreeToRefuse, Suggest, operatorAry, nodeUser, v.GoBackNode, r)
r.SendWecharMsgTextCard(r.Step, "驳回", Suggest)
} else { //同意操作
v.Status = 2 //同意
@ -844,7 +844,7 @@ func (r *RunWorkFlow) RunNodeHandle(userKey int64, AgreeToRefuse int, Suggest st
r.FlowList[i].Operator = operatorAry
r.Participant = append(r.Participant, nodeUser...)
currentStep, nextStep := r.TallyPaceStepes(userKeyStr, r.Step, r.FlowList[i]) //获取执行步伐
fmt.Printf("执行工作流节点处理-------3------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n currentStep=======>%v\n nextStep=======>%v\n\n", userKey, AgreeToRefuse, Suggest, currentStep, nextStep)
// fmt.Printf("执行工作流节点处理-------3------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n currentStep=======>%v\n nextStep=======>%v\n\n", userKey, AgreeToRefuse, Suggest, currentStep, nextStep)
if nextStep > 0 {
if r.ToNextNodeRunOrClose(userKeyStr, nextStep) {
r.Step = nextStep
@ -895,7 +895,7 @@ func (r *RunWorkFlow) RunNodeHandle(userKey int64, AgreeToRefuse int, Suggest st
r.FlowList[i].Operator = operatorAry
r.Participant = append(r.Participant, nodeUser...)
currentStep, nextStep := r.TallyPaceStepes(userKeyStr, r.Step, r.FlowList[i]) //获取执行步伐
fmt.Printf("执行工作流节点处理-------4------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n currentStep=======>%v\n nextStep=======>%v\n\n", userKey, AgreeToRefuse, Suggest, currentStep, nextStep)
// fmt.Printf("执行工作流节点处理-------4------>userKey=======>%v\n AgreeToRefuse=======>%v\n Suggest=======>%v\n currentStep=======>%v\n nextStep=======>%v\n\n", userKey, AgreeToRefuse, Suggest, currentStep, nextStep)
if nextStep > 0 {
if r.ToNextNodeRunOrClose(userKeyStr, nextStep) {
r.Step = currentStep

14
overall/publicmethod/formatOutput.go
View File

@ -32,12 +32,17 @@ 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)
// fmt.Printf("\n\n格式化输出----->加密西悉尼--->%v--->%v\n\n", err, string(dataJson))
if err != nil {
c.JSON(http.StatusOK, Reply{code, msg, data}) //输出json格式数据
} else {
@ -264,6 +269,9 @@ func ReceiveData(c *gin.Context) ([]byte, error) {
if overall.CONSTANT_CONFIG.Appsetup.OpenSm4 {
var dataCont ReceiveSm4Parameter
err = c.ShouldBindJSON(&dataCont)
// wwwe, _ := json.Marshal(dataCont)
// fmt.Printf("\n\n接收参数解析-------------->%v-------->%v--------->%v\n\n", err, string(wwwe), dataCont)
if err != nil {
return json.Marshal(dataCont)
}
@ -272,8 +280,14 @@ func ReceiveData(c *gin.Context) ([]byte, error) {
if Sm4token != "" {
SM4Iv = Sm4token
}
// fmt.Printf("\n\n接收参数解析------Sm4token-------->%v\n\n", Sm4token)
sm4Iv16 := ProcessString(SM4Iv, 16, "s")
// fmt.Printf("\n\n接收参数解析------sm4Iv16-------->%v\n\n", sm4Iv16)
// fmt.Printf("\n\n接收参数解析------dataCont.EncryptedFile-------->%v\n\n", dataCont.EncryptedFile)
jieMi, err := SM4DecryptNew(dataCont.EncryptedFile, sm4Iv16)
// fmt.Printf("\n\n接收参数解析------err-------->%v\n\n", err)
if err != nil {
return json.Marshal(val)
}

13
overall/publicmethod/newSm4.go
View File

@ -109,21 +109,34 @@ func SM4DecryptNew(data, sm4IvStr string, key ...string) ([]byte, error) {
sm4Iv16 := ProcessString(SM4Iv, 16, "s")
iv := []byte(sm4Iv16)
keySm4 := []byte(SM4Key)
// fmt.Printf("\n\nSM4解密新版------SM4Key-------->%v\n\n", SM4Key)
// fmt.Printf("\n\nSM4解密新版------sm4Iv16-------->%v\n\n", sm4Iv16)
block, err := sm4.NewCipher(keySm4)
// fmt.Printf("\n\nSM4解密新版------err-------->%v\n\n", err)
if err != nil {
return []byte(""), err
}
//使用hex解码
decodeString, err := hex.DecodeString(data)
// fmt.Printf("\n\nSM4解密新版------decodeString-------->%v\n\n", err)
if err != nil {
return []byte(""), err
}
//CBC模式 优点：具有较好的安全性，能够隐藏明文的模式和重复性。 缺点：加密过程是串行的，不适合并行处理。
blockMode := cipher.NewCBCDecrypter(block, iv)
// fmt.Printf("\n\nSM4解密新版------blockMode-------->%v\n\n", blockMode)
//下文有详解这段代码的含义
blockMode.CryptBlocks(decodeString, decodeString)
// fmt.Printf("\n\nSM4解密新版------blockMode-------->%v\n\n", blockMode)
// fmt.Printf("\n\nSM4解密新版------decodeString-------->%v\n\n", decodeString)
//去掉明文后面的填充数据
plainText := unPaddingLastGroup(decodeString)
// fmt.Printf("\n\nSM4解密新版------plainText-------->%v\n\n", plainText)
return plainText, nil
}

6
overall/publicmethod/sm4.go
View File

@ -78,8 +78,14 @@ func unPaddingLastGroup(plainText []byte) []byte {
//1.拿到切片中的最后一个字节
length := len(plainText)
lastChar := plainText[length-1]
// fmt.Printf("\n\n去掉明文后面的填充数据---------------->%v\n\n", lastChar)
//2.将最后一个数据转换为整数
number := int(lastChar)
// fmt.Printf("\n\n去掉明文后面的填充数据--------number-------->%v\n\n", number)
// fmt.Printf("\n\n去掉明文后面的填充数据--------:length-numbe-------->%v\n\n", length-number)
// if length-number < 0 {
// return []byte{}
// }
return plainText[:length-number]
}

Write Preview
Loading…
Cancel
Save