Browse Source

fix :
Go server :add record deal status
Python : module import err

zzf 1 year ago
parent
commit
022084971b
4 changed files with 21 additions and 10 deletions
  1. 1 1
      AIT/api/record.go
  2. 4 3
      AIT/exception/errmsg/errMsg.go
  3. 13 3
      AIT/initialize/ws.go
  4. 3 3
      classify-ai-backend/main.py

+ 1 - 1
AIT/api/record.go

@@ -123,7 +123,7 @@ func (f *RecordService) SaveRecord(c *gin.Context) {
 	if count := f.CreateRecord(record); count <= 0 {
 		response.Failed(errmsg.RecordSaveError, c)
 	} else {
-		response.Success(errmsg.SaveSuccess, record.Id, c)
+		response.Success(errmsg.RecordSaveSuccess, record.Id, c)
 	}
 }
 

+ 4 - 3
AIT/exception/errmsg/errMsg.go

@@ -3,8 +3,6 @@ package errmsg
 const (
 	ParamInvalid              = "请求参数无效"
 	FindSuccess               = "查询成功"
-	SaveSuccess               = "保存完成"
-	SaveFailed                = "保存失败"
 	UserAlreadyExists         = "用户已存在"
 	UserRegisterSuccess       = "用户注册成功"
 	UserRegisterFailed        = "用户注册失败"
@@ -19,7 +17,10 @@ const (
 	FileUploadError           = "文件上传失败"
 	JSONParseError            = "JSON 转换异常"
 	SendMessageError          = "消息发送失败"
-	SocketCloseError          = "Socket关闭异常"
+	SocketCloseError          = "Socket关闭异常:"
 	RecordSaveError           = "记录保存失败"
+	RecordSaveSuccess         = "记录保存成功"
 	RecordNotFoundError       = "未找到记录"
+	TestResultFailed          = "测试失败,失败原因:"
+	TestResultSuccess         = "测试完成,测试结果:"
 )

+ 13 - 3
AIT/initialize/ws.go

@@ -1,6 +1,7 @@
 package initialize
 
 import (
+	"AIT/exception/errmsg"
 	"AIT/service"
 	"encoding/json"
 	"fmt"
@@ -31,6 +32,7 @@ type Message struct {
 	Recipient string `json:"recipient,omitempty"`
 	Content   string `json:"content,omitempty"`
 	RecordId  string `json:"recordId,omitempty"`
+	Status    bool   `json:"status,omitempty"`
 }
 
 // Manager define a ws server manager
@@ -80,7 +82,14 @@ func (manager *ClientManager) Start() {
 					//更新record
 					recordService := GetRecord()
 					if MessageStruct.RecordId != "" {
-						recordService.UpdateRecordById(MessageStruct.RecordId, MessageStruct.Content)
+
+						content := ""
+						if MessageStruct.Status {
+							content = errmsg.TestResultSuccess + MessageStruct.Content
+						} else {
+							content = errmsg.TestResultFailed + MessageStruct.Content
+						}
+						recordService.UpdateRecordById(MessageStruct.RecordId, content)
 					}
 
 				} else {
@@ -107,7 +116,7 @@ func (c *Client) Read() {
 		Manager.Unregister <- c
 		err := c.Socket.Close()
 		if err != nil {
-			fmt.Println("socket close error:" + err.Error())
+			fmt.Println(errmsg.SocketCloseError + err.Error())
 			return
 		}
 	}()
@@ -119,6 +128,7 @@ func (c *Client) Read() {
 			Manager.Unregister <- c
 			err := c.Socket.Close()
 			if err != nil {
+				fmt.Println(errmsg.SocketCloseError + err.Error())
 				return
 			}
 			break
@@ -132,7 +142,7 @@ func (c *Client) Write() {
 	defer func() {
 		err := c.Socket.Close()
 		if err != nil {
-			fmt.Println("socket close error:" + err.Error())
+			fmt.Println(errmsg.SocketCloseError + err.Error())
 			return
 		}
 	}()

+ 3 - 3
classify-ai-backend/main.py

@@ -6,7 +6,7 @@ import uuid
 import config
 from loguru import logger
 import json
-from car_cf import car_classification
+from algo.car_cf import car_classification
 
 logger.add(config.log_path, rotation="50 MB", encoding='utf-8')
 
@@ -53,12 +53,12 @@ class MessageOperation:
             else:
                 self.response_status = False
                 self.response_content = "无法识别"
-                self.record_id = "null"
+                # self.record_id = "null"
         except Exception as e:
             self.msg_type = ERROR_TYPE
             self.response_status = False
             self.response_content = str(e)
-            self.record_id = "null"
+            # self.record_id = "null"
 
     def pack(self) -> str:
         return json.dumps({