智慧交流-货车统计

app/operation/controller/captureController.go

@@ -197,3 +197,22 @@ func (c captureCtl) PeriodsList(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
 }
+
+func (c captureCtl) CarrecordCount(ctx *gin.Context) {
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	var req model.RequestCarRecordCountFilter
+	err := ctx.ShouldBindQuery(&req)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	var records interface{}
+	err = nil
+	records, err = service.CaptureCarRecordService.GetCarRecordCount(claims.TenantId, req)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, records))
+}

app/operation/edge_service/forCaptureItsService.go

@@ -17,6 +17,7 @@ type ForCaptureIts struct{}
 // CaptureItsReq 请求参数
 type ForCaptureItsReq struct {
 	Codes []string `json:"codes"` //抓拍单元 capture_sn列表
+	Types []int    `json:"types"` //vtype 车型
 	Start string   `json:"start"`
 	End   string   `json:"end"`
 	Flag  int      `json:"flag"` //0按日 1按月
@@ -38,7 +39,9 @@ type ForCaptureItsData struct {
 	Province string `json:"province"` //归属地时-用到的省
 	City     string `json:"city"`     //归属地时-用到的城市
 
-	Vtype int `json:"vtype"` //车型统计
+	Vtype int    `json:"vtype"` //车型统计
+	Plate string `json:"plate"` //车牌记录-车牌
+	Speed int    `json:"speed"` //车牌记录-车速
 }
 
 // VehicleTotal 统计日 月 车流量 数据
@@ -83,13 +86,21 @@ func (f ForCaptureIts) VehicleHourTotal(reqPostData ForCaptureItsReq) ([]ForCapt
 	return f.pubPost(reqPostData, api)
 }
 
+// Vehicleplate 同步车牌记录
+func (f ForCaptureIts) Vehicleplate(reqPostData ForCaptureItsReq) ([]ForCaptureItsData, error) {
+	api := "/data/v1/its/vehicleplate"
+	return f.pubPost(reqPostData, api)
+}
+
 //公用 post请求
 func (f ForCaptureIts) pubPost(reqPostData ForCaptureItsReq, api string) ([]ForCaptureItsData, error) {
 	cfg := config.Instance()
 	api = cfg.Foreign.IotEdgeUrl + api
 	//fmt.Printf("api = %v \n", api)
-	reqPostData.Start = reqPostData.Start + " 00:00:00"
-	reqPostData.End = reqPostData.End + " 23:59:59"
+	if !strings.Contains(reqPostData.Start, ":") {
+		reqPostData.Start = reqPostData.Start + " 00:00:00"
+		reqPostData.End = reqPostData.End + " 23:59:59"
+	}
 	//fmt.Printf("reqPostData = %v \n", reqPostData)
 	method := "POST"
 	client := &http.Client{}

app/operation/model/captureCarRecord.go

@@ -0,0 +1,25 @@
+package model
+
+type ResponseCarRecordCount struct {
+	NowDate string `json:"nowDate"` //当前返回时间
+	CountN  int    `json:"countN"`  //大型货车
+	CountT  int    `json:"countT"`  //中型货车
+}
+type ResponseCarModelCount struct {
+	TotalCountN int `json:"totalCountN"` //大型货车 总数量
+	TotalCountT int `json:"totalCountT"` //中型货车 总数量
+}
+
+type ResponseCarRecordAll struct {
+	CarRecordCount []ResponseCarRecordCount `json:"carRecordCount"` //汇总line图
+	CarModelCount  ResponseCarModelCount    `json:"carModelCount"`  //车型总数量
+	Details        interface{}              `json:"details"`        //下方车牌明细
+}
+
+type RequestCarRecordCountFilter struct {
+	StartTime string `form:"startTime"`
+	EndTime   string `form:"endTime"`
+	QueryType string `form:"queryType"` //类型 month月 day日
+	CaptureId int    `form:"captureId"` //抓拍单元
+	CarModel  int    `form:"carModel"`  //2大型 1中型 0全部
+}

app/operation/service/captureCarRecordService.go

@@ -0,0 +1,80 @@
+package service
+
+import (
+	"iot_manager_service/app/device/dao"
+	"iot_manager_service/app/operation/edge_service"
+	"iot_manager_service/app/operation/model"
+	"iot_manager_service/util/common"
+	"strconv"
+)
+
+// CaptureCarRecordService 货车记录
+var CaptureCarRecordService = new(captureCarRecordService)
+
+type captureCarRecordService struct{}
+
+var (
+	MediumTruckVType int = 26 //中型货车
+	BigTruckVType    int = 17 //大型货车
+)
+
+func (s captureCarRecordService) GetCarRecordCount(tenantId int, req model.RequestCarRecordCountFilter) (*model.ResponseCarRecordAll, error) {
+	unit := dao.CaptureUnit{
+		TenantId: tenantId,
+		ID:       req.CaptureId,
+	}
+	unit.GetDevice()
+	var codes []string
+	codes = append(codes, unit.CaptureSn)
+	forCaptureIts := edge_service.ForCaptureIts{}
+	vtypes := []int{MediumTruckVType, BigTruckVType}
+	if req.CarModel == 1 {
+		vtypes = []int{MediumTruckVType}
+	} else if req.CarModel == 2 {
+		vtypes = []int{BigTruckVType}
+	}
+	forData, err := forCaptureIts.Vehicleplate(
+		edge_service.ForCaptureItsReq{
+			Types: vtypes, //中型货车 大货车
+			Codes: codes,
+			Start: req.StartTime,
+			End:   req.EndTime,
+		})
+	if err != nil {
+		return nil, err
+	}
+	var countTimes []string
+	if req.QueryType == "month" {
+		countTimes = common.GetTimeMonths(req.StartTime, req.EndTime) //时间范围 月
+	} else {
+		countTimes = common.GetTimeDays(req.StartTime, req.EndTime) //时间范围 天
+	}
+	data := make(map[string]int)
+	for _, datum := range forData {
+		key := string(datum.Time[:10])
+		if req.QueryType == "month" {
+			key = string(datum.Time[:7]) + "-01"
+		}
+		vtype := strconv.Itoa(datum.Vtype)
+		data[key+vtype] += 1
+	}
+	var list []model.ResponseCarRecordCount
+	var totalCountN, totalCountT int
+	for _, countTime := range countTimes {
+		key := countTime
+		vtype26 := strconv.Itoa(MediumTruckVType)
+		vtype17 := strconv.Itoa(BigTruckVType)
+		list = append(list, model.ResponseCarRecordCount{
+			NowDate: countTime,
+			CountN:  data[key+vtype17],
+			CountT:  data[key+vtype26],
+		})
+		totalCountN += data[key+vtype17]
+		totalCountT += data[key+vtype26]
+	}
+	return &model.ResponseCarRecordAll{
+		CarRecordCount: list,
+		CarModelCount:  model.ResponseCarModelCount{totalCountN, totalCountT},
+		Details:        forData,
+	}, nil
+}

router/router.go

@@ -604,7 +604,6 @@ func InitRouter(engine *gin.Engine) {
 			businesstacticsGroup.POST("/remove", warn.BusinessTactics.Remove)
 			businesstacticsGroup.POST("/enable-disable", warn.BusinessTactics.Enable)
 		}
-
 	}
 	//智慧交通
 	captureGroup := operationGroup.Group("/capture")
@@ -624,6 +623,8 @@ func InitRouter(engine *gin.Engine) {
 		captureGroup.GET("speed/over-speed-record-sync", operation.Capture.OverSpeedRecordSync)
 		//时段统计
 		captureGroup.GET("periods/list", operation.Capture.PeriodsList)
+		//货车统计
+		captureGroup.GET("carrecord/count", operation.Capture.CarrecordCount)
 	}
 
 }

util/common/common.go

@@ -215,8 +215,11 @@ func TimeStringToGoTime(tm string) time.Time {
 
 // GetTimeDays 时间区间的所有天数
 func GetTimeDays(start_time, stop_time string) []string {
-	tm1, _ := time.Parse("2006-01-02", start_time)
-	tm2, _ := time.Parse("2006-01-02", stop_time)
+	star := []rune(start_time)
+	end := []rune(stop_time)
+	tm1, _ := time.Parse("2006-01-02", string(star[:10]))
+	tm2, _ := time.Parse("2006-01-02", string(end[:10]))
+	//fmt.Printf("star = %v \n", string(star[:10]))
 	sInt := tm1.Unix()
 	eInt := tm2.Unix()
 	var args []string
@@ -230,7 +233,7 @@ func GetTimeDays(start_time, stop_time string) []string {
 	}
 	var days []string
 	for i := 0; i < len(args); i++ {
-		parse, _ := time.Parse("2006-01-02", start_time)
+		parse, _ := time.Parse("2006-01-02", string(star[:10]))
 		date := parse.AddDate(0, 0, i).Format("2006-01-02")
 		days = append(days, date)
 	}