commit

amd64/kubernetes-scheduler/main.go → amd64/dispatch-server/main.go

@@ -5,8 +5,8 @@ package main
 */
 
 import (
-	"cicv-data-closedloop/amd64/kubernetes-scheduler/package/entity"
-	"cicv-data-closedloop/amd64/kubernetes-scheduler/package/handler"
+	"cicv-data-closedloop/amd64/dispatch-server/package/entity"
+	"cicv-data-closedloop/amd64/dispatch-server/package/handler"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/config/c_nacos"
 	"cicv-data-closedloop/common/config/c_oss"

amd64/report-server/application.yaml → amd64/web-server/application.yaml

@@ -1,13 +1,13 @@
-application-name: report-server
+application-name: web-server
 web:
   port: 12345
-  route-prefix: /report-server
+  route-prefix: /web-server
   token: U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM
   white-list:
-    - "/report-server/swagger"
+    - "/web-server/swagger"
 log:
   dir: ./log/
-  prefix: report-server
+  prefix: web-server
 mysql:
   ip: 36.110.106.156
   port: 3306

amd64/web-server/handler/h_monitor.go

@@ -0,0 +1,45 @@
+package handler
+
+import (
+	"cicv-data-closedloop/amd64/web-server/entity"
+	commonEntity "cicv-data-closedloop/common/entity"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+type SaveMonitorRequest struct {
+	CpuTotal    string // cpu总占用
+	MemoryTotal string // 内存总占用
+
+}
+
+// SaveMonitor 保存实车上传的监控信息
+func SaveMonitor(c *gin.Context) {
+	//param := new(SaveMonitorRequest)
+	//// 映射到结构体
+	//if err := c.ShouldBindJSON(&param); err != nil {
+	//	c_log.GlobalLogger.Error("项目启动接收请求参数报错：", err)
+	//	c.JSON(http.StatusBadRequest, commonEntity.Response{
+	//		Code: 500,
+	//		Msg:  "请求体解析失败。",
+	//	})
+	//	return
+	//}
+	var result []entity.Record
+	//for i := 0; i < param.PageSize; i++ {
+	//	result = append(result, entity.Record{
+	//		Team:         "team" + util.NewShortUUID(),
+	//		Topic:        "topic" + util.NewShortUUID(),
+	//		ScoreOnline:  100.0,
+	//		ScoreOffline: 100.0,
+	//		ScoreFinal:   100.0,
+	//		Details:      "sdlkfjsaljfldsakjfkls",
+	//	})
+	//}
+
+	c.JSON(http.StatusOK, commonEntity.Response{
+		Code: 200,
+		Msg:  "分页查询成功。",
+		Data: result,
+	})
+}

amd64/report-server/handler/h_report.go → amd64/web-server/handler/h_report.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"cicv-data-closedloop/amd64/report-server/entity"
+	"cicv-data-closedloop/amd64/web-server/entity"
 	"cicv-data-closedloop/common/config/c_log"
 	commonEntity "cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"
@@ -9,9 +9,10 @@ import (
 	"net/http"
 )
 
-type testStruct struct {
-	Id   int    `db:"id"`
-	Name string `db:"name"`
+type ReportRequest struct {
+	Page  commonEntity.PageRequest
+	Team  string `json:"team"`
+	Topic string `json:"topic"`
 }
 
 // Page 分页查询

amd64/report-server/main.go → amd64/web-server/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/amd64/report-server/handler"
+	"cicv-data-closedloop/amd64/web-server/handler"
 	"cicv-data-closedloop/common/config/c_db"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/gin/middleware"
@@ -67,9 +67,11 @@ func main() {
 	router.Use(middleware.ValidateHeaders(ApplicationYaml.Web.WhiteList, ApplicationYaml.Web.Token)) // 全局请求头校验
 	// 通过路由组设置全局前缀
 	projectPrefix := router.Group(ApplicationYaml.Web.RoutePrefix)
-	// 接口
-	projectPrefix.POST("/page", handler.Page) // 分页查询
-	//projectPrefix.POST("/pdf", handler.Hello)  // pdf下载
+	reportPrefix := projectPrefix.Group("/report")
+	reportPrefix.POST("/page", handler.Page) // 分页查询
+	//reportPrefix.POST("/pdf", handler.Hello)  // pdf下载
+	monitorPrefix := projectPrefix.Group("/monitor")
+	monitorPrefix.POST("/save", handler.SaveMonitor)
 	// 端口
 	err := router.Run(":" + ApplicationYaml.Web.Port)
 	if err != nil {

test/json/main/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/amd64/kubernetes-scheduler/package/entity"
+	"cicv-data-closedloop/amd64/dispatch-server/package/entity"
 	"encoding/json"
 	"fmt"
 )

trigger/pjisuv/cicv_location/overspeed/main/overspeed.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"cicv-data-closedloop/pjisuv_msgs"
+	"math"
+)
+
+func Topic() string {
+	return "/cicv_location"
+}
+
+func Label() string {
+	return "overspeed"
+}
+
+func Rule(data *pjisuv_msgs.PerceptionLocalization) string {
+	if math.Pow(math.Pow(data.VelocityX, 2)+math.Pow(data.VelocityY, 2), 0.5)*3.6 >= 65 {
+		return "overspeed"
+	} else {
+		return ""
+	}
+}