From a922cf813354510a7649e99bbc183f4c101027d5 Mon Sep 17 00:00:00 2001
From: xzb <223@qq.com>
Date: Wed, 27 Dec 2023 13:35:33 +0800
Subject: [PATCH] =?UTF-8?q?iscs=20=20bas=20=20=E5=A4=A7=E7=B3=BB=E7=BB=9F-?=
 =?UTF-8?q?=E9=98=80=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/main.go               | 13 +++++++++----
 sys/iscs_sys/iscs_bas_valve.go | 12 ++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/examples/main.go b/examples/main.go
index 2f86af2..47d2f82 100644
--- a/examples/main.go
+++ b/examples/main.go
@@ -21,14 +21,19 @@ func main() {
 	protoRepo.Fans = append(protoRepo.Fans, &proto.Fan{Id: "fan3", FanType: proto.Fan_SoftStartFan})
 	protoRepo.Fans = append(protoRepo.Fans, &proto.Fan{Id: "fan4", FanType: proto.Fan_HighLowSpeedFan})
 	//
+	protoRepo.Valves = append(protoRepo.Valves, &proto.Valve{Id: "valve1", ValveType: proto.Valve_ElectricControlValve})
+	protoRepo.Valves = append(protoRepo.Valves, &proto.Valve{Id: "valve2", ValveType: proto.Valve_ElectricAirValve})
+	protoRepo.Valves = append(protoRepo.Valves, &proto.Valve{Id: "valve3", ValveType: proto.Valve_CombinationAirValve})
+	protoRepo.Valves = append(protoRepo.Valves, &proto.Valve{Id: "valve4", ValveType: proto.Valve_ElectricButterflyValve})
+	//
 	repo, _ := repository.BuildRepository(protoRepo)
 	sim, _ := newIscsSimulation(repo)
 	sim.StartUp()
 	time.Sleep(2 * time.Second)
-	fi.MotorOperate(sim, "fan2", fi.FiMsOnForward, 60)
-	time.Sleep(8 * time.Second)
-	fi.MotorOperate(sim, "fan2", fi.FiMsOnReverse, 60)
-	time.Sleep(8 * time.Second)
+	fi.ValveOperate(sim, "valve1", 100)
+	time.Sleep(5 * time.Second)
+	fi.ValveOperate(sim, "valve1", 1)
+	time.Sleep(4 * time.Second)
 	sim.Close()
 	time.Sleep(2 * time.Second)
 }
diff --git a/sys/iscs_sys/iscs_bas_valve.go b/sys/iscs_sys/iscs_bas_valve.go
index 44e0e4d..a569913 100644
--- a/sys/iscs_sys/iscs_bas_valve.go
+++ b/sys/iscs_sys/iscs_bas_valve.go
@@ -1,12 +1,12 @@
 package iscs_sys
 
 import (
-	"fmt"
 	"joylink.club/ecs"
 	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 	"joylink.club/rtsssimulation/entity"
+	"math"
 )
 
 // ValveSystem 阀门
@@ -31,18 +31,26 @@ func (s *ValveSystem) Update(w ecs.World) {
 		valve.Closed = valve.OpenRate <= 0
 		valve.Opened = valve.OpenRate >= 100
 		valve.Moving = valve.OpenRate != valveController.TargetOpenRate
-		fmt.Printf("==>>阀门[%s],OpenRate = %d%% , 全开 = %t , 全关 = %t", valveId, valve.OpenRate, valve.Opened, valve.Closed)
+		//fmt.Printf("==>>阀门[%s],OpenRate = %d%% , 全开 = %t , 全关 = %t , Moving = %t ,Pos = %d\n", valveId, valve.OpenRate, valve.Opened, valve.Closed, valve.Moving, position.Pos)
 		//
 		valveModel, ok := wd.Repo.FindById(valveId).(valveModeler)
 		if !ok {
 			valveModel = vm
 		}
+		//计算速度
 		speed := int32((float64(consts.TwoPosMax-consts.TwoPosMin) / float64(valveModel.MaxMoveTime())) * float64(w.Tick()))
+		targetPos := int32((float64(valveController.TargetOpenRate) / float64(100)) * float64(consts.TwoPosMax-consts.TwoPosMin))
+		targetLen := int32(math.Abs(float64(targetPos - position.Pos)))
+		//修正尾速
+		if speed > targetLen {
+			speed = targetLen
+		}
 		if valveController.TargetOpenRate < valve.OpenRate {
 			speed = -speed
 		} else if valveController.TargetOpenRate == valve.OpenRate {
 			speed = 0
 		}
+		position.Speed = speed
 	})
 }