河北承德金隅水泥增加雨量监测因素兼容

adaptors/安心云es主题to广东矿山监测.go

@@ -65,7 +65,7 @@ func (the Adaptor_AXYES_GDKS) getTemplateStr(sensorData models.Source) string {
 	case models.AXY_FactorType_BMWY:
 		templateStr = "{{.structUploadCode}}{{.sensorType}}{{.sensorCode}};{{.sensorType}};{{.sensorName}};{{.longitude}};{{.latitude}};{{.height}};" +
 			"{{.x}}|{{.y}}|{{.z}}||||{{.xAcc}}|{{.yAcc}}|{{.zAcc}};{{.unit}};{{.state}};{{.time}}^"
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		templateStr = "{{.structUploadCode}}{{.sensorType}}{{.sensorCode}};{{.sensorType}};{{.sensorName}};{{.longitude}};{{.latitude}};{{.height}};" +
 			"{{.totrainfall}};{{.unit}};{{.state}};{{.time}}^"
 	case models.AXY_FactorType_SBSPWY:
@@ -149,7 +149,7 @@ func (the Adaptor_AXYES_GDKS) getTemplateObj(sensorData models.Source) map[strin
 		templateMap["x"] = fmt.Sprintf("%.3f", sensorData.Data["x"])
 		templateMap["y"] = fmt.Sprintf("%.3f", sensorData.Data["y"])
 		templateMap["unit"] = "mm"
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		templateMap["totrainfall"] = fmt.Sprintf("%.3f", sensorData.Data["totrainfall"])
 		templateMap["unit"] = "mm"
 	case models.AXY_FactorType_DXSW:
@@ -179,7 +179,7 @@ func (the Adaptor_AXYES_GDKS) getJWDbySensorName(sensorData models.Source) (long
 		longitude = codeArr[1]
 		latitude = codeArr[2]
 		height = codeArr[3]
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 
 	case models.AXY_FactorType_SBSPWY:
 
@@ -199,7 +199,7 @@ func (the Adaptor_AXYES_GDKS) getSensorCodeAndType(sensorData models.Source) (co
 		}
 		codeArr := strings.Split(v, ";")
 		code = codeArr[0]
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		typeCode = "0030"
 		v, isValid := the.RainMap[sensorData.SensorName]
 		if !isValid {

adaptors/安心云es主题to河北矿山监测.go

@@ -79,7 +79,7 @@ func (the Adaptor_AXYES_HBKS) getTemplateStr(sensorData models.Source) string {
 	case models.AXY_FactorType_BMWY:
 		templateStr = "{{.structUploadCode}}{{.sensorType}}{{.sensorCode}};{{.sensorType}};{{.sensorName}};{{.longitude}};{{.latitude}};{{.height}};" +
 			"{{.x}}|{{.y}}|{{.z}}||||{{.xAcc}}|{{.yAcc}}|{{.zAcc}};{{.unit}};{{.state}};{{.time}}^"
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		templateStr = "{{.structUploadCode}}{{.sensorType}}{{.sensorCode}};{{.sensorType}};{{.sensorName}};{{.longitude}};{{.latitude}};{{.height}};" +
 			"{{.totrainfall}};{{.unit}};{{.state}};{{.time}}^"
 	case models.AXY_FactorType_SBSPWY:
@@ -159,7 +159,7 @@ func (the Adaptor_AXYES_HBKS) getTemplateObj(sensorData models.Source) map[strin
 		templateMap["x"] = fmt.Sprintf("%.3f", sensorData.Data["x"])
 		templateMap["y"] = fmt.Sprintf("%.3f", sensorData.Data["y"])
 		templateMap["unit"] = "mm"
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		templateMap["totrainfall"] = fmt.Sprintf("%.3f", sensorData.Data["totrainfall"])
 		templateMap["unit"] = "mm"
 	case models.AXY_FactorType_DXSW:
@@ -197,7 +197,7 @@ func (the Adaptor_AXYES_HBKS) getSensorCodeAndType(sensorData models.Source) (co
 			return
 		}
 		code = v
-	case models.AXY_FactorType_Rain_New:
+	case models.AXY_FactorType_Rain_New, models.AXY_FactorType_Rain_New_o:
 		typeCode = "03"
 		v, isValid := the.RainMap[sensorData.SensorName]
 		if !isValid {

models/EsAggTop.go

@@ -9,6 +9,8 @@ const (
 	// AXY_FactorType_Rain_New 雨量新
 	AXY_FactorType_Rain_New = 422
 
+	AXY_FactorType_Rain_New_o = 521
+
 	// AXY_FactorType_BMWY 表面斜监测（GNSS）
 	AXY_FactorType_BMWY = 13