allied-creation / allied-creation-manufacture · 提交

转到一个项目

作者 yangfu
提交 83f8041bdacccac6bf45b62544850637e4f97457 1 个父辈 e3565360

feat:增加车辆信息查询

内嵌 并排对比
正在显示 5 个修改的文件 包含 97 行增加 和 5 行删除
@@ -13,6 +13,7 @@ import ( @@ -13,6 +13,7 @@ import (
13 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/redis" 13 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/redis"
14 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils" 14 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
15 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log" 15 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
  16 + "math/rand"
16 "strconv" 17 "strconv"
17 "sync" 18 "sync"
18 "time" 19 "time"
@@ -139,9 +140,9 @@ func (deviceCollectionService *DeviceCollectionService) DeviceCollection(createD @@ -139,9 +140,9 @@ func (deviceCollectionService *DeviceCollectionService) DeviceCollection(createD
139 } 140 }
140 } 141 }
141 // TODO:测试假数据，后期注释掉 142 // TODO:测试假数据，后期注释掉
142 - //if createDeviceCollectionCommand.DeviceType == domain.DeviceTypeChuanChuanJi {  
143 - // newDeviceCollection.Values["Count"] = rand.Intn(300)  
144 - //} 143 + if createDeviceCollectionCommand.DeviceType == domain.DeviceTypeChuanChuanJi {
  144 + newDeviceCollection.Values["Count"] = rand.Intn(300)
  145 + }
145 deviceCollection, err := deviceCollectionRepository.Save(newDeviceCollection) 146 deviceCollection, err := deviceCollectionRepository.Save(newDeviceCollection)
146 if err != nil { 147 if err != nil {
147 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 148 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -127,3 +127,14 @@ from ts_product_list @@ -127,3 +127,14 @@ from ts_product_list
127 } 127 }
128 return nil 128 return nil
129 } 129 }
  130 +
  131 +func (dao *DeviceDailyRunningRecordDao) DeviceRunningInfo(companyId, orgId int, deviceCode string, result interface{}) error {
  132 + tx := dao.transactionContext.PgTx
  133 + sql := fmt.Sprintf(`
  134 +select * from device_running_info(?,?,?);
  135 + `)
  136 + if _, err := tx.Query(result, sql, deviceCode, companyId, orgId); err != nil {
  137 + return err
  138 + }
  139 + return nil
  140 +}
@@ -22,6 +22,8 @@ const ( @@ -22,6 +22,8 @@ const (
22 WorkshopProductionEfficiencyStatistics = "WorkshopProductionEfficiencyStatistics" 22 WorkshopProductionEfficiencyStatistics = "WorkshopProductionEfficiencyStatistics"
23 // 设备运行统计 23 // 设备运行统计
24 DeviceRunningStatistics = "DeviceRunningStatistics" 24 DeviceRunningStatistics = "DeviceRunningStatistics"
  25 + // 设备运行信息
  26 + DeviceRunningInfo = "DeviceRunningInfo"
25 ) 27 )
26 28
27 const ( 29 const (
@@ -51,6 +53,9 @@ func (ptr *PGCommonStatisticsService) CommonStatistics(actionType string, queryO @@ -51,6 +53,9 @@ func (ptr *PGCommonStatisticsService) CommonStatistics(actionType string, queryO
51 case DeviceRunningStatistics: 53 case DeviceRunningStatistics:
52 result, err = ptr.DeviceRunningStatistics(queryOptions) 54 result, err = ptr.DeviceRunningStatistics(queryOptions)
53 break 55 break
  56 + case DeviceRunningInfo:
  57 + result, err = ptr.DeviceRunningInfo(queryOptions)
  58 + break
54 } 59 }
55 return result, err 60 return result, err
56 } 61 }
@@ -331,6 +336,80 @@ type DeviceRunningStatisticRequest struct { @@ -331,6 +336,80 @@ type DeviceRunningStatisticRequest struct {
331 Date string `json:"date"` 336 Date string `json:"date"`
332 } 337 }
333 338
  339 +// 设备运行统计
  340 +func (ptr *PGCommonStatisticsService) DeviceRunningInfo(queryOptions map[string]interface{}) (interface{}, error) {
  341 + var request = &DeviceRunningStatisticRequest{}
  342 + if err := utils.LoadQueryObject(queryOptions, request); err != nil {
  343 + return nil, err
  344 + }
  345 + deviceDailyRunningRecordDao, _ := dao.NewDeviceDailyRunningRecordDao(ptr.transactionContext)
  346 + var response = make([]*DeviceInfo, 0)
  347 + deviceDailyRunningRecordDao.DeviceRunningInfo(request.CompanyId, request.OrgId, "CCJ1", &response)
  348 +
  349 + return map[string]interface{}{
  350 + "devices": response,
  351 + "device_summary": ptr.DeviceSummary(response),
  352 + }, nil
  353 +}
  354 +
  355 +func (ptr *PGCommonStatisticsService) DeviceSummary(deviceInfos []*DeviceInfo) interface{} {
  356 + var result = make(map[string]interface{})
  357 + total := len(deviceInfos)
  358 + var (
  359 + deviceRunning = 0
  360 + deviceOff = 0
  361 + deviceErr = 0
  362 + )
  363 +
  364 + for _, v := range deviceInfos {
  365 + if v.TStatus == "待机中" {
  366 + deviceOff += 1
  367 + } else if v.TStatus == "故障中" {
  368 + deviceErr += 1
  369 + } else if v.TStatus == "运行中" {
  370 + deviceRunning += 1
  371 + }
  372 + }
  373 +
  374 + deviceSummary := func(t, num int) interface{} {
  375 + var rate float64
  376 + if t == 0 || num == 0 {
  377 + rate = 0
  378 + } else {
  379 + rate = utils.Round(float64(num*100.0/t), 0)
  380 + }
  381 + return map[string]interface{}{
  382 + "device_number": num,
  383 + "rate": rate,
  384 + }
  385 + }
  386 +
  387 + result = map[string]interface{}{
  388 + "total": total,
  389 + "off": deviceSummary(total, deviceOff),
  390 + "on": deviceSummary(total, deviceRunning),
  391 + "err": deviceSummary(total, deviceRunning),
  392 + }
  393 + return result
  394 +}
  395 +
  396 +type DeviceRunningInfoRequest struct {
  397 + CompanyId int `json:"companyId" valid:"Required"`
  398 + OrgId int `json:"orgId" valid:"Required"`
  399 + WorkshopId int `json:"workshopId"`
  400 +}
  401 +
  402 +type DeviceInfo struct {
  403 + TDeviceName string `json:"t_device_name"`
  404 + TDeviceCode string `json:"t_device_code"`
  405 + TStatus string `json:"t_status"`
  406 + TTemperature float64 `json:"t_temperature"`
  407 + TTemperature1 float64 `json:"t_temperature1"`
  408 + TDeviceType string `json:"t_device_type"`
  409 + TTotal float64 `json:"t_total"`
  410 + TUptime int `json:"t_uptime"`
  411 +}
  412 +
334 func NewPGCommonStatisticsService(transactionContext *pgTransaction.TransactionContext) (*PGCommonStatisticsService, error) { 413 func NewPGCommonStatisticsService(transactionContext *pgTransaction.TransactionContext) (*PGCommonStatisticsService, error) {
335 if transactionContext == nil { 414 if transactionContext == nil {
336 return nil, fmt.Errorf("transactionContext参数不能为nil") 415 return nil, fmt.Errorf("transactionContext参数不能为nil")
@@ -31,8 +31,8 @@ func GetNextMonthFirstDay(d time.Time) time.Time { @@ -31,8 +31,8 @@ func GetNextMonthFirstDay(d time.Time) time.Time {
31 31
32 // GetNextMonthFirstDay 获取传入的时间所在月份的最后一天，即某月最后一天的23:59:59。如传入time.Now(), 返回当前月份的最后一天的23:59:59。 32 // GetNextMonthFirstDay 获取传入的时间所在月份的最后一天，即某月最后一天的23:59:59。如传入time.Now(), 返回当前月份的最后一天的23:59:59。
33 func GetCurrentMonthFirstDay(t time.Time) time.Time { 33 func GetCurrentMonthFirstDay(t time.Time) time.Time {
34 - y, m, d := t.Date()  
35 - result := time.Date(y, m, d, 0, 0, 0, 0, time.Local) 34 + y, m, _ := t.Date()
  35 + result := time.Date(y, m, 1, 0, 0, 0, 0, time.Local)
36 return result 36 return result
37 } 37 }
38 38
@@ -13,4 +13,5 @@ func init() { @@ -13,4 +13,5 @@ func init() {
13 web.Post("/statistics/proportion-of-second-level-statistics", c.CommonStatisticsHandler("ProportionOfSecondLevelStatistics")) 13 web.Post("/statistics/proportion-of-second-level-statistics", c.CommonStatisticsHandler("ProportionOfSecondLevelStatistics"))
14 web.Post("/statistics/workshop-production-efficiency-statistics", c.CommonStatisticsHandler("WorkshopProductionEfficiencyStatistics")) 14 web.Post("/statistics/workshop-production-efficiency-statistics", c.CommonStatisticsHandler("WorkshopProductionEfficiencyStatistics"))
15 web.Post("/statistics/device-running-statistics", c.CommonStatisticsHandler("DeviceRunningStatistics")) 15 web.Post("/statistics/device-running-statistics", c.CommonStatisticsHandler("DeviceRunningStatistics"))
  16 + web.Post("/statistics/device-running-info", c.CommonStatisticsHandler("DeviceRunningInfo"))
16 } 17 }