gaoyagang před 1 rokem
rodič
revize
8c3c6a17b5
3 změnil soubory, kde provedl 33 přidání a 3 odebrání
  1. 30 0
      app/cmd/organization/internal/logic/handler/uf_test.go
  2. 1 1
      go.mod
  3. 2 2
      go.sum

+ 30 - 0
app/cmd/organization/internal/logic/handler/uf_test.go

@@ -0,0 +1,30 @@
+package handler
+
+import (
+	"GtDataStore/app/cmd/organization/internal/config"
+	"encoding/json"
+	"github.com/go-redis/redis/v8"
+	"github.com/zeromicro/go-zero/core/conf"
+	"metawant.greentech.com.cn/gaoyagang/gt-common/envitem"
+	"testing"
+)
+
+func Test_transDeviceUfData(t *testing.T) {
+
+	var c config.Config
+	conf.MustLoad("../../../etc/organization.test.yaml", &c)
+	//ctx := svc.NewServiceContext(c)
+
+	envitem.SetOptions(envitem.Options{GtServerIp: c.GtServerIp, AdjustValue: true, Cache: redis.NewClient(&redis.Options{Addr: c.Cache[0].Host, Password: c.Cache[0].Pass, MaxRetries: 5})})
+
+	j := `{"tmp":{"project_id":92,"item":"C.M.UF1_DB@press_PV","default_val":0},"feed_flow":{"project_id":92,"item":"C.M.UF1_FT_JS@out","default_val":0},"feed_pressure":{"project_id":92,"item":"C.M.UF1_PT_JS@out","default_val":0},"product_pressure":{"project_id":92,"item":"C.M.UF1_PT_CS@out","default_val":0},"feed_wq_turbidity":{"project_id":92,"item":"C.M.UF_Tur_ZJS@out","default_val":0},"water_temperature":{"project_id":92,"item":"C.M.RO_TT_ZJS@out","default_val":0},"product_wq_ph":{"project_id":92,"item":"C.M.UF_PH_ZCS@out","default_val":0},"step":{"project_id":92,"item":"C.M.UF1_DB@word_control","default_val":0},"filter_time":{"project_id":92,"item":"C.M.UF1_DB@time_production_display"},"filter_cycle":{"project_id":92,"item":"C.M.UF1_DB@cycle_out"},"permeability":{"project_id":92,"item":"UF1Per"},"flux":{"project_id":92,"item":"UF1_FluxF"}}`
+
+	mulItems := envitem.MultiEnvItem{}
+
+	json.Unmarshal([]byte(j), &mulItems)
+
+	step := mulItems.GetItemInt64Value("filter_cycle")
+
+	t.Log(step)
+	//t.Log(mulItems)
+}

+ 1 - 1
go.mod

@@ -9,7 +9,7 @@ require (
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	k8s.io/apimachinery v0.28.3
-	metawant.greentech.com.cn/gaoyagang/gt-common v1.2.15
+	metawant.greentech.com.cn/gaoyagang/gt-common v1.2.18
 )
 
 require (

+ 2 - 2
go.sum

@@ -277,8 +277,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-metawant.greentech.com.cn/gaoyagang/gt-common v1.2.15 h1:x8T7M4J8euqzI9f6Q/oizQTqkOYN8ozquPm3KH2u7FI=
-metawant.greentech.com.cn/gaoyagang/gt-common v1.2.15/go.mod h1:TiS/E+b6WFW/0Ei4H/djoguRTnfeBsiUnt5odj1C9n4=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.2.18 h1:HFC7nrLPB9cg+Zp8SeP0Z73eT6fePEEe7niliepIfjU=
+metawant.greentech.com.cn/gaoyagang/gt-common v1.2.18/go.mod h1:TiS/E+b6WFW/0Ei4H/djoguRTnfeBsiUnt5odj1C9n4=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=