Просмотр исходного кода

fit:
uf增加渗透率的指标

gaoyagang 2 лет назад
Родитель
Сommit
2fc10af6c9
2 измененных файлов с 6 добавлено и 4 удалено
  1. 1 0
      app/cmd/organization/internal/logic/handler/uf.go
  2. 5 4
      app/model/dcWorkingUfModel_gen.go

+ 1 - 0
app/cmd/organization/internal/logic/handler/uf.go

@@ -72,6 +72,7 @@ func transDeviceUfData(datas []model.DcDeviceBind) ([]model.DcWorkingUf, error)
 			ProductPressure:  data.Items.GetItemFloat64Value("product_pressure"),
 			ProductPressure:  data.Items.GetItemFloat64Value("product_pressure"),
 			Tmp:              data.Items.GetItemFloat64Value("tmp"),
 			Tmp:              data.Items.GetItemFloat64Value("tmp"),
 			Flux:             data.Items.GetItemFloat64Value("flux"),
 			Flux:             data.Items.GetItemFloat64Value("flux"),
+			Permeability:     data.Items.GetItemFloat64Value("permeability"),
 			FeedWqTurbidity:  data.Items.GetItemFloat64Value("feed_wq_turbidity"),
 			FeedWqTurbidity:  data.Items.GetItemFloat64Value("feed_wq_turbidity"),
 			FeedWqPh:         data.Items.GetItemInt64Value("feed_wq_ph"),
 			FeedWqPh:         data.Items.GetItemInt64Value("feed_wq_ph"),
 			ProductWqPh:      data.Items.GetItemInt64Value("product_wq_ph"),
 			ProductWqPh:      data.Items.GetItemInt64Value("product_wq_ph"),

+ 5 - 4
app/model/dcWorkingUfModel_gen.go

@@ -50,6 +50,7 @@ type (
 		ProductPressure  float64   `db:"product_pressure"`  // 产水压力
 		ProductPressure  float64   `db:"product_pressure"`  // 产水压力
 		Tmp              float64   `db:"tmp"`               // 跨膜压差
 		Tmp              float64   `db:"tmp"`               // 跨膜压差
 		Flux             float64   `db:"flux"`              // 膜通量
 		Flux             float64   `db:"flux"`              // 膜通量
+		Permeability     float64   `db:"permeability"`      // 渗透率
 		FeedWqTurbidity  float64   `db:"feed_wq_turbidity"` // 进水浊度
 		FeedWqTurbidity  float64   `db:"feed_wq_turbidity"` // 进水浊度
 		FeedWqPh         int64     `db:"feed_wq_ph"`        // 进水 PH 值
 		FeedWqPh         int64     `db:"feed_wq_ph"`        // 进水 PH 值
 		ProductWqPh      int64     `db:"product_wq_ph"`     // 产水 PH 值
 		ProductWqPh      int64     `db:"product_wq_ph"`     // 产水 PH 值
@@ -121,11 +122,11 @@ func (m *defaultDcWorkingUfModel) FindOne(ctx context.Context, id int64) (*DcWor
 }
 }
 
 
 func (m *defaultDcWorkingUfModel) MultiInsert(ctx context.Context, datas []DcWorkingUf) (int64, error) {
 func (m *defaultDcWorkingUfModel) MultiInsert(ctx context.Context, datas []DcWorkingUf) (int64, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, dcWorkingUfRowsExpectAutoSet)
+	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, dcWorkingUfRowsExpectAutoSet)
 
 
 	if bulk, err := sqlx.NewBulkInserter(m.conn, query); err == nil {
 	if bulk, err := sqlx.NewBulkInserter(m.conn, query); err == nil {
 		for _, data := range datas {
 		for _, data := range datas {
-			if err = bulk.Insert(data.ProjectId, data.DeviceCode, data.WaterTemperature, data.FeedFlow, data.ConFlow, data.ProductFlow, data.FeedPressure, data.ConPressure, data.ProductPressure, data.Tmp, data.Flux, data.FeedWqTurbidity, data.FeedWqPh, data.ProductWqPh, data.FeedWqAl, data.ProductWqAl, data.FeedWqFe, data.ProductWqFe, data.FeedWqMn, data.ProductWqMn, data.FeedWqSio2, data.ProductWqSio2, data.FeedWqCod, data.ProductWqCod, data.FeedWqP, data.ProductWqP, data.Step, data.FilterTime, data.FilterCycle, data.CTime); err != nil {
+			if err = bulk.Insert(data.ProjectId, data.DeviceCode, data.WaterTemperature, data.FeedFlow, data.ConFlow, data.ProductFlow, data.FeedPressure, data.ConPressure, data.ProductPressure, data.Tmp, data.Flux, data.Permeability, data.FeedWqTurbidity, data.FeedWqPh, data.ProductWqPh, data.FeedWqAl, data.ProductWqAl, data.FeedWqFe, data.ProductWqFe, data.FeedWqMn, data.ProductWqMn, data.FeedWqSio2, data.ProductWqSio2, data.FeedWqCod, data.ProductWqCod, data.FeedWqP, data.ProductWqP, data.Step, data.FilterTime, data.FilterCycle, data.CTime); err != nil {
 				return 0, err
 				return 0, err
 			}
 			}
 		}
 		}
@@ -138,8 +139,8 @@ func (m *defaultDcWorkingUfModel) MultiInsert(ctx context.Context, datas []DcWor
 }
 }
 
 
 func (m *defaultDcWorkingUfModel) Insert(ctx context.Context, data *DcWorkingUf) (sql.Result, error) {
 func (m *defaultDcWorkingUfModel) Insert(ctx context.Context, data *DcWorkingUf) (sql.Result, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, dcWorkingUfRowsExpectAutoSet)
-	ret, err := m.conn.ExecCtx(ctx, query, data.ProjectId, data.DeviceCode, data.WaterTemperature, data.FeedFlow, data.ConFlow, data.ProductFlow, data.FeedPressure, data.ConPressure, data.ProductPressure, data.Tmp, data.Flux, data.FeedWqTurbidity, data.FeedWqPh, data.ProductWqPh, data.FeedWqAl, data.ProductWqAl, data.FeedWqFe, data.ProductWqFe, data.FeedWqMn, data.ProductWqMn, data.FeedWqSio2, data.ProductWqSio2, data.FeedWqCod, data.ProductWqCod, data.FeedWqP, data.ProductWqP, data.Step, data.FilterTime, data.FilterCycle, data.CTime)
+	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, dcWorkingUfRowsExpectAutoSet)
+	ret, err := m.conn.ExecCtx(ctx, query, data.ProjectId, data.DeviceCode, data.WaterTemperature, data.FeedFlow, data.ConFlow, data.ProductFlow, data.FeedPressure, data.ConPressure, data.ProductPressure, data.Tmp, data.Flux, data.Permeability, data.FeedWqTurbidity, data.FeedWqPh, data.ProductWqPh, data.FeedWqAl, data.ProductWqAl, data.FeedWqFe, data.ProductWqFe, data.FeedWqMn, data.ProductWqMn, data.FeedWqSio2, data.ProductWqSio2, data.FeedWqCod, data.ProductWqCod, data.FeedWqP, data.ProductWqP, data.Step, data.FilterTime, data.FilterCycle, data.CTime)
 	return ret, err
 	return ret, err
 }
 }