fix :设备工时修改、增加报警状态、报警状态位分析修改

yangfu
pkg/application/device/command/update_device.go
pkg/domain/device_collection_machine.go
pkg/domain/device_daily_running_record.go
pkg/domain/device_running_data.go
pkg/infrastructure/domainService/pg_workshop_data_consume_service.go
--- a/pkg/application/device/command/update_device.go
查看文件 @bcbf0f9
+++ b/pkg/application/device/command/update_device.go
查看文件 @bcbf0f9
@@ -32,7 +32,7 @@ type UpdateDeviceCommand struct {
 	// 风险等级 1:高 2:中 3:低
 	RiskLevel int `cname:"风险等级 1:高 2:中 3:低" json:"riskLevel" valid:"Required"`
 	// 标准工时
-	UnitProductionSecTime int `cname:"标准工时" json:"unitProductionSecTime"`
+	UnitProductionSecTime float64 `cname:"标准工时" json:"unitProductionSecTime"`
 }
 func (updateDeviceCommand *UpdateDeviceCommand) Valid(validation *validation.Validation) {
--- a/pkg/domain/device_collection_machine.go
查看文件 @bcbf0f9
+++ b/pkg/domain/device_collection_machine.go
查看文件 @bcbf0f9
@@ -36,12 +36,12 @@ type DeviceChuanChuanJi struct {
 	Month       int   `json:"Month"` // 月
 	Day         int   `json:"Day"`   // 日
 	ProductType int   `json:"ProductType"`
-	//ProductType1 string `json:"ProductType1"` // 产品类型：当前产品种类
 }
 // 速冻线
 type DeviceSuDongXian struct {
 	CurrTemp float64 `json:"CurrTemp"` // 当前温度：当前温度
+	Alarm    int     `json:"alarm"`    // 报警
 }
 // 封口机
@@ -51,7 +51,6 @@ type DeviceFengKouJi struct {
 	Month       int   `json:"Month"` // 月
 	Day         int   `json:"Day"`   // 日
 	ProductType int   `json:"ProductType"`
-	//ProductType1 string `json:"ProductType1"` // 产品类型：当前产品种类
 }
 // 封箱机
@@ -61,7 +60,6 @@ type DeviceFengXiangJi struct {
 	Month       int   `json:"Month"` // 月
 	Day         int   `json:"Day"`   // 日
 	ProductType int   `json:"ProductType"`
-	//ProductType1 string `json:"ProductType1"` // 产品类型：当前产品种类
 }
 func ProductTypeToProductCode(productType int) string {
--- a/pkg/domain/device_daily_running_record.go
查看文件 @bcbf0f9
+++ b/pkg/domain/device_daily_running_record.go
查看文件 @bcbf0f9
@@ -135,7 +135,7 @@ func (d *DeviceRunningRecordInfo) AddDeviceRunningData(t time.Time, data *Device
 	if len(d.DeviceType) == 0 {
 		d.DeviceType = data.DeviceType
 	}
-	d.CurrentStatus = data.StartupStatus | (1 << data.ComStatus)
+	d.CurrentStatus = data.StartupStatus | (data.ComStatus << 1) | (data.Alarm << 2)
 	d.ResetUpTime()
 	d.Count += data.Count
 	//d.Temp = data.FrontTemp
@@ -165,6 +165,7 @@ func (d *DeviceRunningRecordInfo) AddTimeLineDeviceStatus(t time.Time, data *Dev
 	}
 	v.UpdateUp(t, data.StartupStatus)
 	v.UpdateCom(t, data.ComStatus)
+	v.UpdateAlarm(t, data.Alarm)
 }
 // 重置运行时长
@@ -199,9 +200,14 @@ func (d *DeviceRunningRecordInfo) HourDeviceStatusDetail(endTime int) map[string
 	err := make([][]int, 0)
 	var begin, end int = 0, 0
 	/*
-			1.故障: 1 0 \ 0 0
-		    2.正常: 1 1
-		    3.停机：0 1
+		   旧：	1.故障: 1 0 \ 0 0
+			    2.正常: 1 1
+			    3.停机：0 1
+
+		   新： 只要未开机，就是待机中状态
+		        1.故障:  1 0 0 / 1 0 1  / 1 1 1 /         1/5/7
+				2.正常: 1 1 0                             3
+				3.停机：0 0 0  /  0 1 0  / 0 0 1 / 0 1 1  0/2/4/6
 	*/
 	var status = 1
 	// 添加数据
@@ -227,13 +233,13 @@ func (d *DeviceRunningRecordInfo) HourDeviceStatusDetail(endTime int) map[string
 		if com&index > 0 {
 			val |= 2
 		}
-		if val == 1 {
+		if val == 1 || val == 5 || val == 7 {
 			return 1 //故障
 		}
 		if val == 3 {
 			return 2 //正常
 		}
-		if val == 2 || val == 0 {
+		if val == 0 || val == 2 || val == 4 || val == 6 {
 			return 3 //停机
 		}
 		return 3 // 停机
@@ -294,6 +300,8 @@ type HourDeviceStatus struct {
 	Up int `json:"up"`
 	// 通讯
 	Com int `json:"com"`
+	// 报警
+	Alarm int `json:"alarm"`
 }
 // 更新启动状态
@@ -324,6 +332,20 @@ func (d *HourDeviceStatus) UpdateCom(t time.Time, c int) {
 	return
 }
+// 更新报警状态
+func (d *HourDeviceStatus) UpdateAlarm(t time.Time, c int) {
+	m := t.Minute()
+	bit := 1 << (m / d.Window)
+	if c&1 == 0 {
+		return
+	}
+	if d.Alarm&bit > 0 {
+		return
+	}
+	d.Alarm |= bit
+	return
+}
+
 // 计算状态持续的时间
 func (d *HourDeviceStatus) CountTime(v int) time.Duration {
 	l := 60 / d.Window
@@ -346,5 +368,6 @@ func NewHourDeviceStatus() *HourDeviceStatus {
 		Window: DefaultTimeWindow,
 		Up:     0,
 		Com:    0,
+		Alarm:  0,
 	}
 }
--- a/pkg/domain/device_running_data.go
查看文件 @bcbf0f9
+++ b/pkg/domain/device_running_data.go
查看文件 @bcbf0f9
@@ -25,6 +25,8 @@ type DeviceRunningData struct {
 	StartupStatus int `json:"startupStatus"`
 	// 通讯状态：1：通讯正常，0：设备未上电或与采集端通讯故障
 	ComStatus int `json:"comStatus"`
+	// 报警状态：1：故障，0：正常
+	Alarm int `json:"alarm"`
 	// 附加数据
 	// 匹配数目
--- a/pkg/infrastructure/domainService/pg_workshop_data_consume_service.go
查看文件 @bcbf0f9
+++ b/pkg/infrastructure/domainService/pg_workshop_data_consume_service.go
查看文件 @bcbf0f9
@@ -160,6 +160,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
 			}
 			data.Temp1 = utils.Truncate(deviceYouZhaJi.FrontTemp, 1)
 			data.Temp2 = utils.Truncate(deviceYouZhaJi.BackTemp, 1)
+			data.Alarm = deviceYouZhaJi.Alarm
 		} else {
 			deviceYouZhaJi := &domain.DeviceYouZhaJi2{}
 			err = json.Unmarshal(mBytes, deviceYouZhaJi)
@@ -168,6 +169,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
 			}
 			data.Temp1 = utils.Truncate(deviceYouZhaJi.Temp1, 1)
 			data.Temp2 = utils.Truncate(deviceYouZhaJi.Temp2, 1)
+			data.Alarm = deviceYouZhaJi.Alarm
 		}
 		break
 	//串串机
@@ -193,6 +195,7 @@ func (ptr *PGWorkshopDataConsumeService) newDeviceRunningData(record *domain.Dev
 			break
 		}
 		data.Temp1 = utils.Truncate(deviceSuDongXian.CurrTemp, 1)
+		data.Alarm = deviceSuDongXian.Alarm
 		break
 	//封口机
 	case domain.DeviceTypeFengKouJi: