|
|
package service
|
|
|
|
|
|
import (
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
"github.com/linmadan/egglib-go/core/application"
|
|
|
"github.com/linmadan/egglib-go/utils/tool_funs"
|
...
|
...
|
@@ -8,26 +9,27 @@ import ( |
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/deviceCollection/query"
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/factory"
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/domainService"
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/redis"
|
|
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
|
|
|
"strconv"
|
|
|
"sync"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
type DeviceCollectionService struct {
|
|
|
}
|
|
|
|
|
|
var (
|
|
|
DeviceDataCache = NewDeviceDataInstance()
|
|
|
)
|
|
|
|
|
|
// 创建
|
|
|
func (deviceCollectionService *DeviceCollectionService) CreateDeviceCollection(createDeviceCollectionCommand *command.CreateDeviceCollectionCommand) (interface{}, error) {
|
|
|
if err := createDeviceCollectionCommand.ValidateCommand(); err != nil {
|
|
|
return nil, application.ThrowError(application.ARG_ERROR, err.Error())
|
|
|
}
|
|
|
transactionContext, err := factory.CreateTransactionContext(nil)
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
if err := transactionContext.StartTransaction(); err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
defer func() {
|
|
|
transactionContext.RollbackTransaction()
|
|
|
}()
|
|
|
|
|
|
newDeviceCollection := &domain.DeviceCollection{
|
|
|
//DeviceCollectionId: createDeviceCollectionCommand.DeviceCollectionId,
|
|
|
WorkShopName: createDeviceCollectionCommand.WorkShopName,
|
...
|
...
|
@@ -38,6 +40,31 @@ func (deviceCollectionService *DeviceCollectionService) CreateDeviceCollection(c |
|
|
CollectionTime: createDeviceCollectionCommand.CollectionTime,
|
|
|
Values: createDeviceCollectionCommand.Values,
|
|
|
}
|
|
|
var lastDeviceCollectionRecord = &domain.DeviceCollection{}
|
|
|
var err error
|
|
|
if createDeviceCollectionCommand.PreCheck {
|
|
|
//前置验证,限制设备上报速率
|
|
|
if lastDeviceCollectionRecord, err = DeviceDataCache.Add(newDeviceCollection.DeviceSn, newDeviceCollection.DeviceType, newDeviceCollection); err != nil {
|
|
|
//log.Logger.Error(err.Error()+newDeviceCollection.DeviceSn)
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
}
|
|
|
if lastDeviceCollectionRecord == nil {
|
|
|
//log.Logger.Error("未找到上一条设备数据")
|
|
|
return nil, nil
|
|
|
}
|
|
|
}
|
|
|
|
|
|
transactionContext, err := factory.CreateTransactionContext(nil)
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
if err := transactionContext.StartTransaction(); err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
defer func() {
|
|
|
transactionContext.RollbackTransaction()
|
|
|
}()
|
|
|
|
|
|
var deviceCollectionRepository domain.DeviceCollectionRepository
|
|
|
if value, err := factory.CreateDeviceCollectionRepository(map[string]interface{}{
|
|
|
"transactionContext": transactionContext,
|
...
|
...
|
@@ -46,16 +73,49 @@ func (deviceCollectionService *DeviceCollectionService) CreateDeviceCollection(c |
|
|
} else {
|
|
|
deviceCollectionRepository = value
|
|
|
}
|
|
|
if deviceCollection, err := deviceCollectionRepository.Save(newDeviceCollection); err != nil {
|
|
|
deviceCollection, err := deviceCollectionRepository.Save(newDeviceCollection)
|
|
|
if err != nil {
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
}
|
|
|
|
|
|
//处理设备数据
|
|
|
switch deviceCollection.DeviceType {
|
|
|
case domain.DeviceTypeBaoXianJi, domain.DeviceTypeChuanChuanJi, domain.DeviceTypeFengKouJi, domain.DeviceTypeFengXiangJi:
|
|
|
if v, ok := deviceCollection.Values["Count"]; ok {
|
|
|
curCount, errCurCount := strconv.Atoi(fmt.Sprintf("%v", v))
|
|
|
v, ok = lastDeviceCollectionRecord.Values["Count"]
|
|
|
if ok {
|
|
|
lastCount, errLastCount := strconv.Atoi(fmt.Sprintf("%v", v))
|
|
|
if errLastCount == nil && errCurCount == nil && lastCount <= curCount {
|
|
|
deviceCollection.Values["Count"] = curCount - lastCount
|
|
|
} else {
|
|
|
deviceCollection.Values["Count"] = 0
|
|
|
/*
|
|
|
设备统计的数量超过一定范围会重置为0,特殊处理0操作
|
|
|
*/
|
|
|
if lastCount > 10000000 && curCount < 1000 {
|
|
|
deviceCollection.Values["Count"] = curCount
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
deviceCollection.Values["Count"] = 0
|
|
|
}
|
|
|
}
|
|
|
break
|
|
|
}
|
|
|
err = domainService.SendWorkshopDeviceData(deviceCollection)
|
|
|
if err != nil {
|
|
|
log.Logger.Error("车间设备数据加入redis失败:" + err.Error())
|
|
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
}
|
|
|
|
|
|
if err := transactionContext.CommitTransaction(); err != nil {
|
|
|
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
}
|
|
|
return map[string]interface{}{
|
|
|
"deviceCollection": deviceCollection,
|
|
|
}, nil
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
// 返回
|
...
|
...
|
@@ -219,3 +279,47 @@ func NewDeviceCollectionService(options map[string]interface{}) *DeviceCollectio |
|
|
newDeviceCollectionService := &DeviceCollectionService{}
|
|
|
return newDeviceCollectionService
|
|
|
}
|
|
|
|
|
|
const DefaultReceiveSpan = 60 // 60 sec
|
|
|
|
|
|
type DeviceDataInstance struct {
|
|
|
//deviceDataCache sync.Map
|
|
|
deviceDataLastTime sync.Map
|
|
|
}
|
|
|
|
|
|
func NewDeviceDataInstance() *DeviceDataInstance {
|
|
|
return &DeviceDataInstance{
|
|
|
deviceDataLastTime: sync.Map{},
|
|
|
}
|
|
|
}
|
|
|
|
|
|
func (d *DeviceDataInstance) Add(deviceSn, deviceType string, data interface{}) (*domain.DeviceCollection, error) {
|
|
|
// 获取数据上一次的
|
|
|
var v interface{}
|
|
|
var ok bool
|
|
|
var now = time.Now().Unix()
|
|
|
var t = now
|
|
|
if v, ok = d.deviceDataLastTime.Load(deviceSn); ok {
|
|
|
t = v.(int64)
|
|
|
} else {
|
|
|
d.deviceDataLastTime.Store(deviceSn, t)
|
|
|
redis.SaveDeviceRealTimeData(deviceSn, data, true)
|
|
|
return nil, errors.New(fmt.Sprintf("ingnore this record"))
|
|
|
}
|
|
|
// 60秒接受一次数据,暂时不用太多数据
|
|
|
if now < t+DefaultReceiveSpan {
|
|
|
return nil, errors.New(fmt.Sprintf("receive too fast wait %v sec", t+DefaultReceiveSpan-now))
|
|
|
}
|
|
|
// 从redis获取最后的数据进行处理
|
|
|
var result = &domain.DeviceCollection{}
|
|
|
if err := redis.GetDeviceRealTimeData(deviceSn, result); err != nil {
|
|
|
if err == domain.ErrorNotFound {
|
|
|
redis.SaveDeviceRealTimeData(deviceSn, data, true)
|
|
|
return nil, nil
|
|
|
}
|
|
|
return nil, err
|
|
|
}
|
|
|
//log.Logger.Debug("",map[string]interface{}{"t":t,"device":deviceSn})
|
|
|
d.deviceDataLastTime.Store(deviceSn, now)
|
|
|
return result, redis.SaveDeviceRealTimeData(deviceSn, data, false)
|
|
|
} |
...
|
...
|
|