update 添加 安全带状态数据转发处理

configFiles/config_转发http2axy60000端口.json

@@ -13,8 +13,13 @@
       }
     },
     "out": {
-      "url": "http://127.0.0.1:4009/write",
+      "httpPost": {
+        "url": "http://218.3.126.49:60000/upload",
         "method": "post"
       }
     }
+  },
+  "info": {
+    "idTemplate": "{{.Values.UcId}}"
+  }
 }

consumers/HTTP_PRPXY/dataModel.go

@@ -0,0 +1,44 @@
+package HTTP_PRPXY
+
+type ABStatus struct {
+	Values ABStatusValues `json:"values"`
+	Secret string         `json:"secret"`
+	Type   string         `json:"type"`
+}
+
+type ABStatusValues struct {
+	CreateTime            int64  `json:"createTime"`
+	Updater               string `json:"updater"`
+	Deleted               bool   `json:"deleted"`
+	Id                    string `json:"id"`
+	WorkId                string `json:"workId"`
+	UcId                  string `json:"ucId"`
+	DeviceCode            string `json:"deviceCode"`
+	UserId                string `json:"userId"`
+	UserName              string `json:"userName"`
+	DataTime              int64  `json:"dataTime"`
+	BeltStatus            string `json:"beltStatus"`
+	DeviceStatus          string `json:"deviceStatus"`
+	StartDate             int64  `json:"startDate"`
+	EndDate               int64  `json:"endDate"`
+	MainVol               int    `json:"mainVol"`
+	AscendWorkCertificate string `json:"ascend_work_certificate"`
+	BeltPoseLeft          string `json:"beltPoseLeft"`
+	BeltPoseRight         string `json:"beltPoseRight"`
+	BeltStatusLeft        string `json:"beltStatusLeft"`
+	BeltStatusRight       string `json:"beltStatusRight"`
+	TickbVol              int    `json:"tickbVol"`
+	//Avatar                interface{} `json:"avatar"`
+	//AlarmType             interface{} `json:"alarmType"`
+	//Identity              interface{} `json:"identity"`
+	//IdentityImg           interface{} `json:"identityImg"`
+	//IdentityImgF          interface{} `json:"identityImgF"`
+	//Phone                 interface{} `json:"phone"`
+	Versions int `json:"versions"`
+	//Team                  interface{} `json:"team"`
+	Longitude string `json:"longitude"`
+	Latitude  string `json:"latitude"`
+	Outsource string `json:"outsource"`
+	LocTime   int64  `json:"locTime"`
+	//WorkLen               interface{} `json:"workLen"`
+}

consumers/consumerHTTP_PRPXY.go

@@ -2,12 +2,14 @@ package consumers
 
 import (
 	"encoding/json"
+	"fmt"
 	"goInOut/adaptors"
 	"goInOut/consumers/HTTP_PRPXY"
 	"goInOut/dbHelper"
+	"goInOut/utils"
+	"io"
 	"log"
-	"strings"
+	"net/http"
-	"time"
 )
 
 type consumerHttpProxy struct {
@@ -44,43 +46,55 @@ func (the *consumerHttpProxy) InputInitial() error {
 		the.Info.IoConfig.In.ApiServer.Port,
 		the.Info.IoConfig.In.ApiServer.Routes,
 	)
-	////inTopic := "Upload/#" //荔枝乌江大桥
-	//for _, inTopic := range the.Info.IoConfig.In.Mqtt.Topics {
-	//	the.InMqtt.Subscribe(inTopic, the.onData)
-	//}
 	the.InApiServer.Initial()
 	return nil
 }
 func (the *consumerHttpProxy) OutputInitial() error {
 	//数据出口
+	the.outHttpPost = &dbHelper.HttpHelper{
+		Url: the.Info.IoConfig.Out.HttpPost.Url,
+	}
 	the.outHttpPost.Initial()
 	return nil
 }
 func (the *consumerHttpProxy) Work() {
 	go func() {
-		for {
+		router := "POST /onData"
-
+		the.InApiServer.RouteRegister(router, the.onData)
-			log.Printf("取出ch数据,剩余[%d] ", len(the.ch))
+		the.InApiServer.Run()
-
-			time.Sleep(100 * time.Millisecond)
-		}
 	}()
 }
-func (the *consumerHttpProxy) onData(inTopic string, Msg string) {
+func (the *consumerHttpProxy) onData(w http.ResponseWriter, r *http.Request) {
-	if len(Msg) > 100 {
+	route := "/onData"
-		log.Printf("mqtt-recv:[%s]:%s ...", inTopic, Msg[:100])
+	w.Header().Set("Content-Type", "application/json")
+	body, err := io.ReadAll(r.Body)
+
+	log.Printf("收到 %s 请求 %s", route, body)
+
+	bodyObj := HTTP_PRPXY.ABStatus{}
+	err = json.Unmarshal(body, &bodyObj)
+	if err != nil {
+		log.Printf("body 解析失败,请检查 %s", err.Error())
+		return
 	}
+	idTemplate := the.Info.OtherInfo["idTemplate"]
 
-	topicPrefixIndex := strings.LastIndex(inTopic, "/")
+	id, err := utils.TextTemplateMatch(bodyObj, idTemplate)
-	matchTopic := inTopic[:topicPrefixIndex]
+	if err != nil {
-	adaptor := the.getAdaptor(matchTopic)
+		log.Printf("解析id 失败,请检查 %s", err.Error())
-	if adaptor != nil {
+	}
-		needPush := adaptor.Transform(matchTopic, Msg)
+	params := map[string]string{
-		if len(needPush) > 0 {
+		"id": id,
-			the.ch <- needPush
 	}
+	resp, err := the.outHttpPost.HttpPostWithParams(string(body), params)
+	if err != nil {
+		return
 	}
+	log.Printf("应答: %s", resp)
+	defer fmt.Fprintf(w, resp)
+
 }
+
 func (the *consumerHttpProxy) getAdaptor(flag string) (adaptor adaptors.IAdaptor4) {
 	bridgeCode := ""
 	if v, ok := the.Info.OtherInfo["bridgeCode"]; ok {

dbHelper/apiServerHelper.go

@@ -10,6 +10,7 @@ type ApiServerHelper struct {
 	mux    *http.ServeMux
 	routes map[string]string
 	port   uint
+	server http.Server
 }
 
 func NewApiServer(port uint, routes map[string]string) *ApiServerHelper {
@@ -24,26 +25,34 @@ func (the *ApiServerHelper) Initial() {
 	the.mux = http.NewServeMux()
 
 	// 创建 HTTP 服务器
-	ser := http.Server{
+	the.server = http.Server{
 		Handler: the.mux,
 		Addr:    fmt.Sprintf(":%d", the.port),
 	}
 
 	the.routeRegister()
 
-	log.Printf("apiServer监听端口 %d", the.port)
-	go log.Fatal(ser.ListenAndServe())
 }
+func (the *ApiServerHelper) Run() {
 
+	the.server.ListenAndServe()
+	log.Printf("apiServer监听端口 %d", the.port)
+}
 func (the *ApiServerHelper) routeRegister() {
 
-	for _, rote := range the.routes {
+	for _, route := range the.routes {
-		the.mux.HandleFunc(rote, func(w http.ResponseWriter, r *http.Request) {
+		the.mux.HandleFunc(route, func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Content-Type", "application/json")
-			s := fmt.Sprintf(`{"rote":"%s","resp":"安全带状态应答"}`, rote)
+			s := fmt.Sprintf(`{"route":"%s","resp":"安全带状态应答"}`, route)
-			println("收到请求", rote)
+			println("收到请求", route)
 			fmt.Fprintf(w, s)
 		})
-		log.Printf("注册路由 %s", rote)
+		log.Printf("注册路由 %s", route)
 	}
 }
+func (the *ApiServerHelper) RouteRegister(route string, handler func(w http.ResponseWriter, r *http.Request)) {
+
+	the.mux.HandleFunc(route, handler)
+	log.Printf("注册路由 %s", route)
+
+}

dbHelper/httpHelper.go

@@ -8,9 +8,9 @@ import (
 	"log"
 	"mime/multipart"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
-	"time"
 )
 
 type HttpHelper struct {
@@ -23,8 +23,6 @@ type HttpHelper struct {
 func (the *HttpHelper) Initial() {
 	the.client = http.Client{}
 
-	time.Sleep(time.Second * 1)
-
 }
 func (the *HttpHelper) HttpGet(queryBody string) string {
 	url := the.Url
@@ -95,6 +93,37 @@ func (the *HttpHelper) PublishWithHeader(messageBytes []byte, headers map[string
 	}
 	return resp, err
 }
+func (the *HttpHelper) HttpPostWithParams(queryBody string, params map[string]string) (string, error) {
+	tr := &http.Transport{
+		DisableKeepAlives: true,
+		TLSClientConfig:   &tls.Config{InsecureSkipVerify: true},
+	}
+	client := &http.Client{Transport: tr}
+	UrlParams := url.Values{}
+	for k, v := range params {
+		UrlParams.Set(k, v)
+	}
+	targetUrl, _ := url.ParseRequestURI(the.Url)
+	targetUrl.RawQuery = UrlParams.Encode()
+
+	req, err := http.NewRequest("POST", targetUrl.String(), strings.NewReader(queryBody))
+	req.Header.Set("Content-Type", "application/json")
+
+	log.Printf("http post 开始请求,%s", targetUrl)
+	resp, err := client.Do(req)
+	if err != nil {
+		fmt.Println("请求POST异常 ", err, resp)
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println("请求ReadAll异常 ", err, resp)
+		return "", err
+	}
+	return string(body), err
+}
 
 // 静态方法
 func HttpGet(url string, queryBody string) string {

testUnit/安心云http转发_test.go

@@ -0,0 +1,38 @@
+package testUnit
+
+import (
+	"fmt"
+	"goInOut/utils"
+	"testing"
+)
+
+// 定义一个结构体，包含嵌套的结构体字段
+type Person struct {
+	Name Name `json:"name"`
+}
+
+type Name struct {
+	First string `json:"first"`
+	Last  string `json:"last"`
+}
+
+func Test_httpProxy(t *testing.T) {
+
+}
+
+func Test_template(t *testing.T) {
+	// 创建一个Person实例
+	person := Person{
+		Name: Name{
+			First: "John",
+			Last:  "Doe",
+		},
+	}
+
+	templateStr := "Hello, {{.Name.First}}   !"
+	sbs, err := utils.TextTemplateMatch(person, templateStr)
+	println(sbs)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+}

utils/textTemplateHandler.go

@@ -0,0 +1,22 @@
+package utils
+
+import (
+	"strings"
+	"text/template"
+)
+
+func TextTemplateMatch(obj any, textTemplate string) (string, error) {
+	// 定义模板字符串
+	tmpl, err := template.New("template").Parse(textTemplate)
+	if err != nil {
+		panic(err)
+	}
+
+	sb := strings.Builder{}
+	err = tmpl.Execute(&sb, obj)
+	if err != nil {
+		return "", err
+	}
+	sbs := sb.String()
+	return sbs, err
+}