Browse Source

feat:异常捕获

wangshan 3 years ago
parent
commit
7243648c52

+ 1 - 1
src/jfw/modules/bigmember/src/service/analysis/decision.go

@@ -46,8 +46,8 @@ var ServiceId = 6
 
 //采购单位和中标企业 其他项目明细/类似项目明细
 func (this *Analysis) ProjectInfoByBW() {
-	userId, _ := this.GetSession("userId").(string)
 	defer qutil.Catch()
+	userId, _ := this.GetSession("userId").(string)
 	r := func() Result {
 		if this.Method() != "POST" {
 			return Result{Data: nil, Error_msg: Error_msg_1005}

+ 7 - 4
src/jfw/modules/bigmember/src/service/analysis/potential.go

@@ -589,6 +589,7 @@ type PCInfo struct {
 
 //采购单位
 func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr map[string]interface{}, pcor string) []*PTComs {
+	defer qutil.Catch()
 	var (
 		ADRes_r     []*PTComs
 		entersFifty []string
@@ -626,10 +627,10 @@ func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr m
 			wg.Add(1)
 			wc <- true
 			go func(entersFifty []string) {
+				defer qutil.Catch()
 				defer func() {
 					wg.Done()
 					<-wc
-					qutil.Catch()
 				}()
 				entInfo := entity.GetEntInfo(entersFifty, pcor)
 				lock.Lock()
@@ -669,6 +670,7 @@ func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr m
 
 //采购单位
 func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface{}) []*PTComs {
+	defer qutil.Catch()
 	var ADRes = []*PTComs{}
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
@@ -695,10 +697,10 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 				wg.Add(1)
 				wc <- true
 				go func(entersFifty []string) {
+					defer qutil.Catch()
 					defer func() {
 						wg.Done()
 						<-wc
-						qutil.Catch()
 					}()
 					entInfo := entity.GetEntInfoByQYXY(entersFifty, "C")
 					wl.Lock()
@@ -783,6 +785,7 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 
 //中标单位
 func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interface{}, omyr map[string]interface{}, pcor string) []*PTComs {
+	defer qutil.Catch()
 	var ADRes = []*PTComs{}
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
@@ -812,10 +815,10 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 				wg.Add(1)
 				wc <- true
 				go func(entersFifty []string, pcor string) {
+					defer qutil.Catch()
 					defer func() {
 						wg.Done()
 						<-wc
-						qutil.Catch()
 					}()
 					entInfo := entity.GetEntInfoByQYXY(entersFifty, pcor)
 					wl.Lock()
@@ -840,10 +843,10 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 			wg.Add(1)
 			wc <- true
 			go func(entersFifty []string, pcor string) {
+				defer qutil.Catch()
 				defer func() {
 					wg.Done()
 					<-wc
-					qutil.Catch()
 				}()
 				entInfo := entity.GetEntInfoByQYXY(entersFifty, pcor)
 				wl.Lock()