renguanyu
/
gin-vue-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

pull/1/head
超级管理员 4 years ago
parent
03fa438aac
commit
e8691dcdd4
1 changed files with 89 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 171
      server/api/v1/examtestpage/healthreportstat.go

171
server/api/v1/examtestpage/healthreportstat.go
View File

@ -252,103 +252,110 @@ func (h *HealthReportStat) PostReportAnswerListAll(c *gin.Context) {
func (d *dataLockStatistics) getUserAnswerList(jobid, tadayTime string, page int, pageSize int64, legalAreaList []locationing.LegalArea) { func (d *dataLockStatistics) getUserAnswerList(jobid, tadayTime string, page int, pageSize int64, legalAreaList []locationing.LegalArea) {
d.mutext.Lock() d.mutext.Lock()
defer d.mutext.Unlock() defer d.mutext.Unlock()
_, reportAnswerInfoList, _, _ := commonus.GetUserWriteAnswer(jobid, tadayTime, page, pageSize) calCulTime := tadayTime + " 12:00:00"
var AdmDivStruct []commonus.AdministrativeDivision timeStamp := commonus.DateToTimeStamp(calCulTime)
var writeInfo []locationing.ReportAddress var judgeWriteInfoUser locationing.ReportAddress
for _, v := range reportAnswerInfoList.Answers { getReportAddressErr := global.GVA_DB_HealthReport.Where("calcultime = ?", timeStamp).Take(&judgeWriteInfoUser).Error
for _, v_sun := range v.ReportValues { if getReportAddressErr != nil {
if v_sun.Text != "" {
var writeInfoUser locationing.ReportAddress _, reportAnswerInfoList, _, _ := commonus.GetUserWriteAnswer(jobid, tadayTime, page, pageSize)
var AdmDiv commonus.AdministrativeDivision var AdmDivStruct []commonus.AdministrativeDivision
AdmDivMap := commonus.MapOut() var writeInfo []locationing.ReportAddress
countSplit := strings.Split(v_sun.Text, "省") for _, v := range reportAnswerInfoList.Answers {
if len(countSplit) >= 2 { for _, v_sun := range v.ReportValues {
writeInfoUser.WechatId = v.Userid if v_sun.Text != "" {
writeInfoUser.Userid = v.Userid var writeInfoUser locationing.ReportAddress
writeInfoUser.AddTime = time.Now().Unix() var AdmDiv commonus.AdministrativeDivision
writeInfoUser.Address = v_sun.Text AdmDivMap := commonus.MapOut()
calCulTime := tadayTime + " 12:00:00" countSplit := strings.Split(v_sun.Text, "省")
writeInfoUser.CalCulTime = commonus.DateToTimeStamp(calCulTime) if len(countSplit) >= 2 {
writeInfoUser.WechatId = v.Userid
AdmDiv.Userid = v.Userid writeInfoUser.Userid = v.Userid
AdmDiv.Province = countSplit[0] + "省" writeInfoUser.AddTime = time.Now().Unix()
writeInfoUser.Province = countSplit[0] + "省" writeInfoUser.Address = v_sun.Text
AdmDivMap["userid"] = v.Userid
AdmDivMap["province"] = countSplit[0] + "省" writeInfoUser.CalCulTime = commonus.DateToTimeStamp(calCulTime)
AdmDivMap["id"] = v.IdType AdmDiv.Userid = v.Userid
AdmDiv.Province = countSplit[0] + "省"
countSplitSun := strings.Split(countSplit[1], "市") writeInfoUser.Province = countSplit[0] + "省"
if len(countSplitSun) > 2 { AdmDivMap["userid"] = v.Userid
AdmDiv.City = countSplitSun[0] + "市" AdmDivMap["province"] = countSplit[0] + "省"
AdmDiv.County = countSplitSun[1] + "市"
writeInfoUser.City = countSplitSun[0] + "市" AdmDivMap["id"] = v.IdType
writeInfoUser.County = countSplitSun[1] + "市"
countSplitSun := strings.Split(countSplit[1], "市")
AdmDivMap["city"] = countSplitSun[0] + "市" if len(countSplitSun) > 2 {
AdmDivMap["county"] = countSplitSun[1] + "市" AdmDiv.City = countSplitSun[0] + "市"
} else { AdmDiv.County = countSplitSun[1] + "市"
AdmDiv.City = countSplitSun[0] + "市" writeInfoUser.City = countSplitSun[0] + "市"
writeInfoUser.City = countSplitSun[0] + "市" writeInfoUser.County = countSplitSun[1] + "市"
AdmDivMap["city"] = countSplitSun[0] + "市"
if len(countSplitSun) == 2 { AdmDivMap["city"] = countSplitSun[0] + "市"
countSplitSunes := strings.Split(countSplitSun[1], "县") AdmDivMap["county"] = countSplitSun[1] + "市"
if len(countSplitSun) > 1 { } else {
AdmDiv.County = countSplitSunes[0] + "县" AdmDiv.City = countSplitSun[0] + "市"
writeInfoUser.County = countSplitSunes[0] + "县" writeInfoUser.City = countSplitSun[0] + "市"
AdmDivMap["county"] = countSplitSunes[0] + "县" AdmDivMap["city"] = countSplitSun[0] + "市"
} if len(countSplitSun) == 2 {
countSplitSunesi := strings.Split(countSplitSun[1], "区") countSplitSunes := strings.Split(countSplitSun[1], "县")
if len(countSplitSunesi) > 1 { if len(countSplitSun) > 1 {
AdmDiv.County = countSplitSunesi[0] + "区" AdmDiv.County = countSplitSunes[0] + "县"
writeInfoUser.County = countSplitSunes[0] + "区" writeInfoUser.County = countSplitSunes[0] + "县"
AdmDivMap["county"] = countSplitSunesi[0] + "区" AdmDivMap["county"] = countSplitSunes[0] + "县"
}
countSplitSunesi := strings.Split(countSplitSun[1], "区")
if len(countSplitSunesi) > 1 {
AdmDiv.County = countSplitSunesi[0] + "区"
writeInfoUser.County = countSplitSunes[0] + "区"
AdmDivMap["county"] = countSplitSunesi[0] + "区"
}
// fmt.Printf("%v切割地址%v-------------%v\n", v.Userid, countSplitSunes, len(countSplitSunes))
} }
// fmt.Printf("%v切割地址%v-------------%v\n", v.Userid, countSplitSunes, len(countSplitSunes))
} }
} // //获取个人信息
// weChatUserCont := getWechatUserInfo(v.Userid)
//获取个人信息
weChatUserCont := getWechatUserInfo(v.Userid)
writeInfoUser.UserName = weChatUserCont.Name // writeInfoUser.UserName = weChatUserCont.Name
writeInfoUser.UserTel = weChatUserCont.Mobile // writeInfoUser.UserTel = weChatUserCont.Mobile
AdmDivMap["user_name"] = weChatUserCont.Name // AdmDivMap["user_name"] = weChatUserCont.Name
AdmDivMap["user_tel"] = weChatUserCont.Name // AdmDivMap["user_tel"] = weChatUserCont.Name
abnormalIsTrue := false abnormalIsTrue := false
for _, expVal := range legalAreaList { for _, expVal := range legalAreaList {
if expVal.ProvinceName == AdmDiv.Province { if expVal.ProvinceName == AdmDiv.Province {
if expVal.CityName == AdmDiv.City { if expVal.CityName == AdmDiv.City {
abnormalIsTrue = true abnormalIsTrue = true
}
} }
} }
AdmDivMap["abnormalIsTrue"] = abnormalIsTrue
if abnormalIsTrue == true {
writeInfoUser.IsDbnormal = 1
// fmt.Printf("报警1=====>%v", abnormalIsTrue)
} else {
writeInfoUser.IsDbnormal = 2
d.baoJing = append(d.baoJing, AdmDivMap)
// fmt.Printf("报警2=====>%v", abnormalIsTrue)
}
AdmDivStruct = append(AdmDivStruct, AdmDiv)
d.dataMap = append(d.dataMap, AdmDivMap)
writeInfo = append(writeInfo, writeInfoUser)
} }
AdmDivMap["abnormalIsTrue"] = abnormalIsTrue
if abnormalIsTrue == true {
writeInfoUser.IsDbnormal = 1
// fmt.Printf("报警1=====>%v", abnormalIsTrue)
} else {
writeInfoUser.IsDbnormal = 2
d.baoJing = append(d.baoJing, AdmDivMap)
// fmt.Printf("报警2=====>%v", abnormalIsTrue)
}
AdmDivStruct = append(AdmDivStruct, AdmDiv)
d.dataMap = append(d.dataMap, AdmDivMap)
writeInfo = append(writeInfo, writeInfoUser)
}
}
} }
} }
errDb := global.GVA_DB_HealthReport.Create(&writeInfo).Error
if errDb != nil {
}
} }
// errDb := global.GVA_DB_HealthReport.Create(&writeInfo).Error
// if errDb != nil {
// }
// fmt.Printf("%v切割地址%v-------------%v\n", page, jhs, len(AdmDivStruct)) // fmt.Printf("%v切割地址%v-------------%v\n", page, jhs, len(AdmDivStruct))
myStatisWg.Done() myStatisWg.Done()
} }

Write Preview
Loading…
Cancel
Save