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