fix
This commit is contained in:
parent
e6179bfaa0
commit
a031a25de0
@ -10,17 +10,17 @@ import (
|
||||
"context"
|
||||
"ifms/internal/mods"
|
||||
"ifms/internal/mods/autocontrol"
|
||||
api3 "ifms/internal/mods/autocontrol/api"
|
||||
biz3 "ifms/internal/mods/autocontrol/biz"
|
||||
dal3 "ifms/internal/mods/autocontrol/dal"
|
||||
api6 "ifms/internal/mods/autocontrol/api"
|
||||
biz6 "ifms/internal/mods/autocontrol/biz"
|
||||
dal6 "ifms/internal/mods/autocontrol/dal"
|
||||
"ifms/internal/mods/digital"
|
||||
api2 "ifms/internal/mods/digital/api"
|
||||
biz2 "ifms/internal/mods/digital/biz"
|
||||
dal2 "ifms/internal/mods/digital/dal"
|
||||
"ifms/internal/mods/envmonitor"
|
||||
api4 "ifms/internal/mods/envmonitor/api"
|
||||
biz4 "ifms/internal/mods/envmonitor/biz"
|
||||
dal4 "ifms/internal/mods/envmonitor/dal"
|
||||
api7 "ifms/internal/mods/envmonitor/api"
|
||||
biz7 "ifms/internal/mods/envmonitor/biz"
|
||||
dal7 "ifms/internal/mods/envmonitor/dal"
|
||||
"ifms/internal/mods/rbac"
|
||||
"ifms/internal/mods/rbac/api"
|
||||
"ifms/internal/mods/rbac/biz"
|
||||
@ -145,55 +145,55 @@ func BuildInjector(ctx context.Context) (*Injector, func(), error) {
|
||||
DB: db,
|
||||
DiagramAPI: apiDiagram,
|
||||
}
|
||||
deviceRunLog := &dal3.DeviceRunLog{
|
||||
deviceRunLog := &dal6.DeviceRunLog{
|
||||
DB: db,
|
||||
}
|
||||
bizDeviceRunLog := &biz3.DeviceRunLog{
|
||||
bizDeviceRunLog := &biz6.DeviceRunLog{
|
||||
Trans: trans,
|
||||
DeviceRunLogDAL: deviceRunLog,
|
||||
}
|
||||
apiDeviceRunLog := &api3.DeviceRunLog{
|
||||
apiDeviceRunLog := &api6.DeviceRunLog{
|
||||
DeviceRunLogBIZ: bizDeviceRunLog,
|
||||
}
|
||||
deviceControlLog := &dal3.DeviceControlLog{
|
||||
deviceControlLog := &dal6.DeviceControlLog{
|
||||
DB: db,
|
||||
}
|
||||
bizDeviceControlLog := &biz3.DeviceControlLog{
|
||||
bizDeviceControlLog := &biz6.DeviceControlLog{
|
||||
Trans: trans,
|
||||
DeviceControlLogDAL: deviceControlLog,
|
||||
}
|
||||
apiDeviceControlLog := &api3.DeviceControlLog{
|
||||
apiDeviceControlLog := &api6.DeviceControlLog{
|
||||
DeviceControlLogBIZ: bizDeviceControlLog,
|
||||
}
|
||||
device := &dal3.Device{
|
||||
device := &dal6.Device{
|
||||
DB: db,
|
||||
}
|
||||
deviceFishPond := &dal3.DeviceFishPond{
|
||||
deviceFishPond := &dal6.DeviceFishPond{
|
||||
DB: db,
|
||||
}
|
||||
bizDevice := &biz3.Device{
|
||||
bizDevice := &biz6.Device{
|
||||
Trans: trans,
|
||||
DeviceDAL: device,
|
||||
DeviceFishPondDAL: deviceFishPond,
|
||||
}
|
||||
apiDevice := &api3.Device{
|
||||
apiDevice := &api6.Device{
|
||||
DeviceBIZ: bizDevice,
|
||||
}
|
||||
bizDeviceFishPond := &biz3.DeviceFishPond{
|
||||
bizDeviceFishPond := &biz6.DeviceFishPond{
|
||||
Trans: trans,
|
||||
DeviceFishPondDAL: deviceFishPond,
|
||||
}
|
||||
apiDeviceFishPond := &api3.DeviceFishPond{
|
||||
apiDeviceFishPond := &api6.DeviceFishPond{
|
||||
DeviceFishPondBIZ: bizDeviceFishPond,
|
||||
}
|
||||
deviceTypeInfo := &dal3.DeviceTypeInfo{
|
||||
deviceTypeInfo := &dal6.DeviceTypeInfo{
|
||||
DB: db,
|
||||
}
|
||||
bizDeviceTypeInfo := &biz3.DeviceTypeInfo{
|
||||
bizDeviceTypeInfo := &biz6.DeviceTypeInfo{
|
||||
Trans: trans,
|
||||
DeviceTypeInfoDAL: deviceTypeInfo,
|
||||
}
|
||||
apiDeviceTypeInfo := &api3.DeviceTypeInfo{
|
||||
apiDeviceTypeInfo := &api6.DeviceTypeInfo{
|
||||
DeviceTypeInfoBIZ: bizDeviceTypeInfo,
|
||||
}
|
||||
autoControl := &autocontrol.AutoControl{
|
||||
@ -204,66 +204,66 @@ func BuildInjector(ctx context.Context) (*Injector, func(), error) {
|
||||
DeviceFishPondAPI: apiDeviceFishPond,
|
||||
DeviceTypeInfoAPI: apiDeviceTypeInfo,
|
||||
}
|
||||
envMonitorDeviceTypeInfo := &dal4.EnvMonitorDeviceTypeInfo{
|
||||
envMonitorDeviceTypeInfo := &dal7.EnvMonitorDeviceTypeInfo{
|
||||
DB: db,
|
||||
}
|
||||
bizEnvMonitorDeviceTypeInfo := &biz4.EnvMonitorDeviceTypeInfo{
|
||||
bizEnvMonitorDeviceTypeInfo := &biz7.EnvMonitorDeviceTypeInfo{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceTypeInfoDAL: envMonitorDeviceTypeInfo,
|
||||
}
|
||||
apiEnvMonitorDeviceTypeInfo := &api4.EnvMonitorDeviceTypeInfo{
|
||||
apiEnvMonitorDeviceTypeInfo := &api7.EnvMonitorDeviceTypeInfo{
|
||||
EnvMonitorDeviceTypeInfoBIZ: bizEnvMonitorDeviceTypeInfo,
|
||||
}
|
||||
envMonitorDevice := &dal4.EnvMonitorDevice{
|
||||
envMonitorDevice := &dal7.EnvMonitorDevice{
|
||||
DB: db,
|
||||
}
|
||||
envMonitorDeviceFishPond := &dal4.EnvMonitorDeviceFishPond{
|
||||
envMonitorDeviceFishPond := &dal7.EnvMonitorDeviceFishPond{
|
||||
DB: db,
|
||||
}
|
||||
envMonitorDeviceSensor := &dal4.EnvMonitorDeviceSensor{
|
||||
envMonitorDeviceSensor := &dal7.EnvMonitorDeviceSensor{
|
||||
DB: db,
|
||||
}
|
||||
bizEnvMonitorDevice := &biz4.EnvMonitorDevice{
|
||||
bizEnvMonitorDevice := &biz7.EnvMonitorDevice{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceDAL: envMonitorDevice,
|
||||
EnvMonitorDeviceFishPondDAL: envMonitorDeviceFishPond,
|
||||
EnvMonitorDeviceSensorDAL: envMonitorDeviceSensor,
|
||||
}
|
||||
apiEnvMonitorDevice := &api4.EnvMonitorDevice{
|
||||
apiEnvMonitorDevice := &api7.EnvMonitorDevice{
|
||||
EnvMonitorDeviceBIZ: bizEnvMonitorDevice,
|
||||
}
|
||||
bizEnvMonitorDeviceFishPond := &biz4.EnvMonitorDeviceFishPond{
|
||||
bizEnvMonitorDeviceFishPond := &biz7.EnvMonitorDeviceFishPond{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceFishPondDAL: envMonitorDeviceFishPond,
|
||||
}
|
||||
apiEnvMonitorDeviceFishPond := &api4.EnvMonitorDeviceFishPond{
|
||||
apiEnvMonitorDeviceFishPond := &api7.EnvMonitorDeviceFishPond{
|
||||
EnvMonitorDeviceFishPondBIZ: bizEnvMonitorDeviceFishPond,
|
||||
}
|
||||
envMonitorDeviceWarningConfig := &dal4.EnvMonitorDeviceWarningConfig{
|
||||
envMonitorDeviceWarningConfig := &dal7.EnvMonitorDeviceWarningConfig{
|
||||
DB: db,
|
||||
}
|
||||
bizEnvMonitorDeviceWarningConfig := &biz4.EnvMonitorDeviceWarningConfig{
|
||||
bizEnvMonitorDeviceWarningConfig := &biz7.EnvMonitorDeviceWarningConfig{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceWarningConfigDAL: envMonitorDeviceWarningConfig,
|
||||
}
|
||||
apiEnvMonitorDeviceWarningConfig := &api4.EnvMonitorDeviceWarningConfig{
|
||||
apiEnvMonitorDeviceWarningConfig := &api7.EnvMonitorDeviceWarningConfig{
|
||||
EnvMonitorDeviceWarningConfigBIZ: bizEnvMonitorDeviceWarningConfig,
|
||||
}
|
||||
bizEnvMonitorDeviceSensor := &biz4.EnvMonitorDeviceSensor{
|
||||
bizEnvMonitorDeviceSensor := &biz7.EnvMonitorDeviceSensor{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceSensorDAL: envMonitorDeviceSensor,
|
||||
}
|
||||
apiEnvMonitorDeviceSensor := &api4.EnvMonitorDeviceSensor{
|
||||
apiEnvMonitorDeviceSensor := &api7.EnvMonitorDeviceSensor{
|
||||
EnvMonitorDeviceSensorBIZ: bizEnvMonitorDeviceSensor,
|
||||
}
|
||||
envMonitorDeviceWarningLog := &dal4.EnvMonitorDeviceWarningLog{
|
||||
envMonitorDeviceWarningLog := &dal7.EnvMonitorDeviceWarningLog{
|
||||
DB: db,
|
||||
}
|
||||
bizEnvMonitorDeviceWarningLog := &biz4.EnvMonitorDeviceWarningLog{
|
||||
bizEnvMonitorDeviceWarningLog := &biz7.EnvMonitorDeviceWarningLog{
|
||||
Trans: trans,
|
||||
EnvMonitorDeviceWarningLogDAL: envMonitorDeviceWarningLog,
|
||||
}
|
||||
apiEnvMonitorDeviceWarningLog := &api4.EnvMonitorDeviceWarningLog{
|
||||
apiEnvMonitorDeviceWarningLog := &api7.EnvMonitorDeviceWarningLog{
|
||||
EnvMonitorDeviceWarningLogBIZ: bizEnvMonitorDeviceWarningLog,
|
||||
}
|
||||
envMonitor := &envmonitor.EnvMonitor{
|
||||
|
Loading…
x
Reference in New Issue
Block a user