修改bug

configs/pcm.yaml

@@ -5,7 +5,7 @@ server:
   middlewares: recovery,secure,nocache,cors,logger # 加载的 gin 中间件列表，多个中间件，逗号(,)隔开 支持 recovery,secure,nocache,cors,logger
 # 柜子连接配置
 cabinet:
-  port: 9098
+  port: 12091
 
 # insecure 不安全的服务配置
 insecure:

internal/pcmserver/bus/cabinet_pkg/cabinet.go

@@ -200,12 +200,12 @@ func (c *cabinet) handlePackage() {
 			case dataProto.StartSymbolPong:
 				c.responseChannels.pongResChannel <- pack
 				// 发送到日志管道
-				deviceLogChan <- &MsgLog{
-					CabinetID: c.memInfo.CabinetID,
-					MsgType:   model.MsgTypeReceive,
-					MsgName:   "pong",
-					Message:   pack,
-				}
+				//deviceLogChan <- &MsgLog{
+				//	CabinetID: c.memInfo.CabinetID,
+				//	MsgType:   model.MsgTypeReceive,
+				//	MsgName:   "pong",
+				//	Message:   pack,
+				//}
 			}
 		}
 	}

internal/pcmserver/bus/cabinet_pkg/service.go

@@ -436,13 +436,12 @@ func SendPing(cabinetId int) error {
 	}
 	tcpServer.WriteData(cab.conn, pingBytes)
 
-	// 记录下发禁止开门指令
-	deviceLogChan <- &MsgLog{
-		CabinetID: cabinetId,
-		MsgType:   model.MsgTypeSend,
-		MsgName:   "ping",
-		Message:   pingBytes,
-	}
+	//deviceLogChan <- &MsgLog{
+	//	CabinetID: cabinetId,
+	//	MsgType:   model.MsgTypeSend,
+	//	MsgName:   "ping",
+	//	Message:   pingBytes,
+	//}
 
 	// 等待响应
 	if err := waitPongResponse(cab.responseChannels.pongResChannel, 10); err != nil {

internal/pcmserver/bus/service/cabinet.go

@@ -303,7 +303,7 @@ func (cs *CabinetService) GetCabinetWithGrids(cabinetId int) (cabinet *model.Cab
 }
 
 func (cs *CabinetService) GetCabinetsByDeptID(deptId int) (cabinets []model.Cabinet, err error) {
-	err = global.DB.Model(&model.Cabinet{}).Where("department_id = ?", deptId).Find(&cabinets).Error
+	err = global.DB.Model(&model.Cabinet{}).Where("department_id = ?", deptId).Find(&cabinets).Order("sort asc").Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return cabinets, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
 	}
@@ -312,7 +312,7 @@ func (cs *CabinetService) GetCabinetsByDeptID(deptId int) (cabinets []model.Cabi
 
 func (cs *CabinetService) GetCabinetIDsByDeptID(deptId int) (ids []int, err error) {
 	var cabinets []model.Cabinet
-	err = global.DB.Model(&model.Cabinet{}).Where("department_id = ?", deptId).Find(&cabinets).Error
+	err = global.DB.Model(&model.Cabinet{}).Where("department_id = ?", deptId).Find(&cabinets).Order("sort asc").Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return ids, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
 	}

internal/pcmserver/bus/service/cabinet_channel.go

@@ -182,7 +182,7 @@ func processGridStatus(grid *model.Grid, oldStoneStatus string) {
 				// 报警
 				iswarn = true
 				grid.ColorStatus = "红色"
-				if oldStoneStatus == model.GridStoneStateMap[model.GridNoStoneStateCode] {
+				if oldStoneStatus == model.GridStoneStateMap[model.GridNoStoneStateCode] || oldStoneStatus == "" {
 					// 之前格子就没存入
 					grid.GridInfo = "未存入"
 				} else if oldStoneStatus == model.GridStoneStateMap[model.GridStoneStateCode] {
@@ -245,6 +245,11 @@ func processOpenGridStatus(grid *model.Grid) {
 	}
 
 	if cabinet_pkg.IsHumanization() {
+
+		if grid.Staff.VacationState == 2 {
+			return
+		}
+
 		// 人性化管理时，不允许开门时打开门，记录警告日志
 		if !cabinet.IsAllowOpen {
 			// 柜子当前是不允许开的,发出警告

scripts/home-client/main.go

@@ -20,7 +20,7 @@ func main() {
 		return
 	}
 
-	wsURL := "ws://10.0.0.3:12090/bus/v1/homePage"
+	wsURL := "ws://10.0.0.230:12090/bus/v1/homePage"
 	d := websocket.Dialer{}
 	conn, _, err := d.Dial(wsURL, nil)
 	if err != nil {
@@ -50,7 +50,7 @@ func writeToken(conn *websocket.Conn, token string) {
 		fmt.Printf("Write Message error:%s\n", err)
 		return
 	}
-	fmt.Println("Write Message success")
+	fmt.Println("Write token success")
 }
 
 func clientReadMessage(conn *websocket.Conn) {