部署测试版

biz/dal/mysql/original_map.go

@@ -0,0 +1,43 @@
+package mysql
+
+import (
+	"context"
+	"fmt"
+	"gorm.io/gen"
+	"pji_desktop_http/biz/dal/query"
+	"pji_desktop_http/biz/model"
+)
+
+func AddOriginalMapOneRecord(ctx context.Context, record model.OriginalMap) error {
+	r := query.OriginalMap
+	err := r.WithContext(ctx).Create(&record)
+	return err
+}
+
+func UpdateOriginalMapOneRecord(ctx context.Context, record model.OriginalMap) (gen.ResultInfo, error) {
+	r := query.OriginalMap
+	fmt.Println("record update", record)
+	info, err := r.WithContext(ctx).Where(r.ID.Eq(record.ID)).Updates(record)
+	if err != nil {
+		return info, err
+	}
+	return info, nil
+}
+
+func QueryOriginalMapByMapIdAndDeviceNo(ctx context.Context, mapId string, deviceNo string) ([]*model.OriginalMap, error) {
+	r := query.OriginalMap
+	originalMaps, err := r.WithContext(ctx).Where(r.MapID.Eq(mapId), r.DeviceNo.Eq(deviceNo)).Find()
+	if err != nil {
+		return nil, err
+	}
+	return originalMaps, nil
+}
+
+func QueryOriginalMapWithoutCicvMap(ctx context.Context) ([]*model.OriginalMap, error) {
+	r := query.OriginalMap
+	originalMaps, err := r.WithContext(ctx).Where(r.CicvMapZipURL.Null()).Or(r.CicvMapPgmURL.Null()).Find()
+	if err != nil {
+		return nil, err
+	}
+	return originalMaps, nil
+}

biz/dal/query/gen.go

@@ -20,6 +20,7 @@ var (
 	Device               *device
 	DeviceMap            *deviceMap
 	MapUpdate            *mapUpdate
+	OriginalMap          *originalMap
 	SimulationTestRecord *simulationTestRecord
 	SystemConfig         *systemConfig
 	World                *world
@@ -30,6 +31,7 @@ func SetDefault(db *gorm.DB, opts ...gen.DOOption) {
 	Device = &Q.Device
 	DeviceMap = &Q.DeviceMap
 	MapUpdate = &Q.MapUpdate
+	OriginalMap = &Q.OriginalMap
 	SimulationTestRecord = &Q.SimulationTestRecord
 	SystemConfig = &Q.SystemConfig
 	World = &Q.World
@@ -41,6 +43,7 @@ func Use(db *gorm.DB, opts ...gen.DOOption) *Query {
 		Device:               newDevice(db, opts...),
 		DeviceMap:            newDeviceMap(db, opts...),
 		MapUpdate:            newMapUpdate(db, opts...),
+		OriginalMap:          newOriginalMap(db, opts...),
 		SimulationTestRecord: newSimulationTestRecord(db, opts...),
 		SystemConfig:         newSystemConfig(db, opts...),
 		World:                newWorld(db, opts...),
@@ -53,6 +56,7 @@ type Query struct {
 	Device               device
 	DeviceMap            deviceMap
 	MapUpdate            mapUpdate
+	OriginalMap          originalMap
 	SimulationTestRecord simulationTestRecord
 	SystemConfig         systemConfig
 	World                world
@@ -66,6 +70,7 @@ func (q *Query) clone(db *gorm.DB) *Query {
 		Device:               q.Device.clone(db),
 		DeviceMap:            q.DeviceMap.clone(db),
 		MapUpdate:            q.MapUpdate.clone(db),
+		OriginalMap:          q.OriginalMap.clone(db),
 		SimulationTestRecord: q.SimulationTestRecord.clone(db),
 		SystemConfig:         q.SystemConfig.clone(db),
 		World:                q.World.clone(db),
@@ -86,6 +91,7 @@ func (q *Query) ReplaceDB(db *gorm.DB) *Query {
 		Device:               q.Device.replaceDB(db),
 		DeviceMap:            q.DeviceMap.replaceDB(db),
 		MapUpdate:            q.MapUpdate.replaceDB(db),
+		OriginalMap:          q.OriginalMap.replaceDB(db),
 		SimulationTestRecord: q.SimulationTestRecord.replaceDB(db),
 		SystemConfig:         q.SystemConfig.replaceDB(db),
 		World:                q.World.replaceDB(db),
@@ -96,6 +102,7 @@ type queryCtx struct {
 	Device               IDeviceDo
 	DeviceMap            IDeviceMapDo
 	MapUpdate            IMapUpdateDo
+	OriginalMap          IOriginalMapDo
 	SimulationTestRecord ISimulationTestRecordDo
 	SystemConfig         ISystemConfigDo
 	World                IWorldDo
@@ -106,6 +113,7 @@ func (q *Query) WithContext(ctx context.Context) *queryCtx {
 		Device:               q.Device.WithContext(ctx),
 		DeviceMap:            q.DeviceMap.WithContext(ctx),
 		MapUpdate:            q.MapUpdate.WithContext(ctx),
+		OriginalMap:          q.OriginalMap.WithContext(ctx),
 		SimulationTestRecord: q.SimulationTestRecord.WithContext(ctx),
 		SystemConfig:         q.SystemConfig.WithContext(ctx),
 		World:                q.World.WithContext(ctx),

biz/dal/query/original_map.gen.go

@@ -0,0 +1,470 @@
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+
+package query
+
+import (
+	"context"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+	"gorm.io/gorm/schema"
+
+	"gorm.io/gen"
+	"gorm.io/gen/field"
+
+	"gorm.io/plugin/dbresolver"
+
+	"pji_desktop_http/biz/model"
+)
+
+func newOriginalMap(db *gorm.DB, opts ...gen.DOOption) originalMap {
+	_originalMap := originalMap{}
+
+	_originalMap.originalMapDo.UseDB(db, opts...)
+	_originalMap.originalMapDo.UseModel(&model.OriginalMap{})
+
+	tableName := _originalMap.originalMapDo.TableName()
+	_originalMap.ALL = field.NewAsterisk(tableName)
+	_originalMap.ID = field.NewString(tableName, "id")
+	_originalMap.DeviceNo = field.NewString(tableName, "device_no")
+	_originalMap.DeviceName = field.NewString(tableName, "device_name")
+	_originalMap.DeviceType = field.NewString(tableName, "device_type")
+	_originalMap.MapID = field.NewString(tableName, "map_id")
+	_originalMap.MapType = field.NewString(tableName, "map_type")
+	_originalMap.MapName = field.NewString(tableName, "map_name")
+	_originalMap.FloorID = field.NewString(tableName, "floor_id")
+	_originalMap.Floor = field.NewString(tableName, "floor")
+	_originalMap.BuildID = field.NewString(tableName, "build_id")
+	_originalMap.BuildName = field.NewString(tableName, "build_name")
+	_originalMap.MapCreateTime = field.NewString(tableName, "map_create_time")
+	_originalMap.MapUpdateTime = field.NewString(tableName, "map_update_time")
+	_originalMap.MapVersion = field.NewString(tableName, "map_version")
+	_originalMap.PjiMapZipURL = field.NewString(tableName, "pji_map_zip_url")
+	_originalMap.CustomAreaID = field.NewInt32(tableName, "custom_area_id")
+	_originalMap.CreatedAt = field.NewTime(tableName, "created_at")
+	_originalMap.UpdatedAt = field.NewTime(tableName, "updated_at")
+	_originalMap.DeletedAt = field.NewField(tableName, "deleted_at")
+	_originalMap.CicvMapPgmURL = field.NewString(tableName, "cicv_map_pgm_url")
+	_originalMap.CicvMapZipURL = field.NewString(tableName, "cicv_map_zip_url")
+
+	_originalMap.fillFieldMap()
+
+	return _originalMap
+}
+
+type originalMap struct {
+	originalMapDo originalMapDo
+
+	ALL           field.Asterisk
+	ID            field.String
+	DeviceNo      field.String
+	DeviceName    field.String
+	DeviceType    field.String
+	MapID         field.String
+	MapType       field.String
+	MapName       field.String
+	FloorID       field.String
+	Floor         field.String
+	BuildID       field.String
+	BuildName     field.String
+	MapCreateTime field.String
+	MapUpdateTime field.String
+	MapVersion    field.String
+	PjiMapZipURL  field.String
+	CustomAreaID  field.Int32
+	CreatedAt     field.Time
+	UpdatedAt     field.Time
+	DeletedAt     field.Field
+	CicvMapPgmURL field.String
+	CicvMapZipURL field.String
+
+	fieldMap map[string]field.Expr
+}
+
+func (o originalMap) Table(newTableName string) *originalMap {
+	o.originalMapDo.UseTable(newTableName)
+	return o.updateTableName(newTableName)
+}
+
+func (o originalMap) As(alias string) *originalMap {
+	o.originalMapDo.DO = *(o.originalMapDo.As(alias).(*gen.DO))
+	return o.updateTableName(alias)
+}
+
+func (o *originalMap) updateTableName(table string) *originalMap {
+	o.ALL = field.NewAsterisk(table)
+	o.ID = field.NewString(table, "id")
+	o.DeviceNo = field.NewString(table, "device_no")
+	o.DeviceName = field.NewString(table, "device_name")
+	o.DeviceType = field.NewString(table, "device_type")
+	o.MapID = field.NewString(table, "map_id")
+	o.MapType = field.NewString(table, "map_type")
+	o.MapName = field.NewString(table, "map_name")
+	o.FloorID = field.NewString(table, "floor_id")
+	o.Floor = field.NewString(table, "floor")
+	o.BuildID = field.NewString(table, "build_id")
+	o.BuildName = field.NewString(table, "build_name")
+	o.MapCreateTime = field.NewString(table, "map_create_time")
+	o.MapUpdateTime = field.NewString(table, "map_update_time")
+	o.MapVersion = field.NewString(table, "map_version")
+	o.PjiMapZipURL = field.NewString(table, "pji_map_zip_url")
+	o.CustomAreaID = field.NewInt32(table, "custom_area_id")
+	o.CreatedAt = field.NewTime(table, "created_at")
+	o.UpdatedAt = field.NewTime(table, "updated_at")
+	o.DeletedAt = field.NewField(table, "deleted_at")
+	o.CicvMapPgmURL = field.NewString(table, "cicv_map_pgm_url")
+	o.CicvMapZipURL = field.NewString(table, "cicv_map_zip_url")
+
+	o.fillFieldMap()
+
+	return o
+}
+
+func (o *originalMap) WithContext(ctx context.Context) IOriginalMapDo {
+	return o.originalMapDo.WithContext(ctx)
+}
+
+func (o originalMap) TableName() string { return o.originalMapDo.TableName() }
+
+func (o originalMap) Alias() string { return o.originalMapDo.Alias() }
+
+func (o originalMap) Columns(cols ...field.Expr) gen.Columns { return o.originalMapDo.Columns(cols...) }
+
+func (o *originalMap) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
+	_f, ok := o.fieldMap[fieldName]
+	if !ok || _f == nil {
+		return nil, false
+	}
+	_oe, ok := _f.(field.OrderExpr)
+	return _oe, ok
+}
+
+func (o *originalMap) fillFieldMap() {
+	o.fieldMap = make(map[string]field.Expr, 21)
+	o.fieldMap["id"] = o.ID
+	o.fieldMap["device_no"] = o.DeviceNo
+	o.fieldMap["device_name"] = o.DeviceName
+	o.fieldMap["device_type"] = o.DeviceType
+	o.fieldMap["map_id"] = o.MapID
+	o.fieldMap["map_type"] = o.MapType
+	o.fieldMap["map_name"] = o.MapName
+	o.fieldMap["floor_id"] = o.FloorID
+	o.fieldMap["floor"] = o.Floor
+	o.fieldMap["build_id"] = o.BuildID
+	o.fieldMap["build_name"] = o.BuildName
+	o.fieldMap["map_create_time"] = o.MapCreateTime
+	o.fieldMap["map_update_time"] = o.MapUpdateTime
+	o.fieldMap["map_version"] = o.MapVersion
+	o.fieldMap["pji_map_zip_url"] = o.PjiMapZipURL
+	o.fieldMap["custom_area_id"] = o.CustomAreaID
+	o.fieldMap["created_at"] = o.CreatedAt
+	o.fieldMap["updated_at"] = o.UpdatedAt
+	o.fieldMap["deleted_at"] = o.DeletedAt
+	o.fieldMap["cicv_map_pgm_url"] = o.CicvMapPgmURL
+	o.fieldMap["cicv_map_zip_url"] = o.CicvMapZipURL
+}
+
+func (o originalMap) clone(db *gorm.DB) originalMap {
+	o.originalMapDo.ReplaceConnPool(db.Statement.ConnPool)
+	return o
+}
+
+func (o originalMap) replaceDB(db *gorm.DB) originalMap {
+	o.originalMapDo.ReplaceDB(db)
+	return o
+}
+
+type originalMapDo struct{ gen.DO }
+
+type IOriginalMapDo interface {
+	gen.SubQuery
+	Debug() IOriginalMapDo
+	WithContext(ctx context.Context) IOriginalMapDo
+	WithResult(fc func(tx gen.Dao)) gen.ResultInfo
+	ReplaceDB(db *gorm.DB)
+	ReadDB() IOriginalMapDo
+	WriteDB() IOriginalMapDo
+	As(alias string) gen.Dao
+	Session(config *gorm.Session) IOriginalMapDo
+	Columns(cols ...field.Expr) gen.Columns
+	Clauses(conds ...clause.Expression) IOriginalMapDo
+	Not(conds ...gen.Condition) IOriginalMapDo
+	Or(conds ...gen.Condition) IOriginalMapDo
+	Select(conds ...field.Expr) IOriginalMapDo
+	Where(conds ...gen.Condition) IOriginalMapDo
+	Order(conds ...field.Expr) IOriginalMapDo
+	Distinct(cols ...field.Expr) IOriginalMapDo
+	Omit(cols ...field.Expr) IOriginalMapDo
+	Join(table schema.Tabler, on ...field.Expr) IOriginalMapDo
+	LeftJoin(table schema.Tabler, on ...field.Expr) IOriginalMapDo
+	RightJoin(table schema.Tabler, on ...field.Expr) IOriginalMapDo
+	Group(cols ...field.Expr) IOriginalMapDo
+	Having(conds ...gen.Condition) IOriginalMapDo
+	Limit(limit int) IOriginalMapDo
+	Offset(offset int) IOriginalMapDo
+	Count() (count int64, err error)
+	Scopes(funcs ...func(gen.Dao) gen.Dao) IOriginalMapDo
+	Unscoped() IOriginalMapDo
+	Create(values ...*model.OriginalMap) error
+	CreateInBatches(values []*model.OriginalMap, batchSize int) error
+	Save(values ...*model.OriginalMap) error
+	First() (*model.OriginalMap, error)
+	Take() (*model.OriginalMap, error)
+	Last() (*model.OriginalMap, error)
+	Find() ([]*model.OriginalMap, error)
+	FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.OriginalMap, err error)
+	FindInBatches(result *[]*model.OriginalMap, batchSize int, fc func(tx gen.Dao, batch int) error) error
+	Pluck(column field.Expr, dest interface{}) error
+	Delete(...*model.OriginalMap) (info gen.ResultInfo, err error)
+	Update(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
+	UpdateSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
+	Updates(value interface{}) (info gen.ResultInfo, err error)
+	UpdateColumn(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
+	UpdateColumnSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
+	UpdateColumns(value interface{}) (info gen.ResultInfo, err error)
+	UpdateFrom(q gen.SubQuery) gen.Dao
+	Attrs(attrs ...field.AssignExpr) IOriginalMapDo
+	Assign(attrs ...field.AssignExpr) IOriginalMapDo
+	Joins(fields ...field.RelationField) IOriginalMapDo
+	Preload(fields ...field.RelationField) IOriginalMapDo
+	FirstOrInit() (*model.OriginalMap, error)
+	FirstOrCreate() (*model.OriginalMap, error)
+	FindByPage(offset int, limit int) (result []*model.OriginalMap, count int64, err error)
+	ScanByPage(result interface{}, offset int, limit int) (count int64, err error)
+	Scan(result interface{}) (err error)
+	Returning(value interface{}, columns ...string) IOriginalMapDo
+	UnderlyingDB() *gorm.DB
+	schema.Tabler
+}
+
+func (o originalMapDo) Debug() IOriginalMapDo {
+	return o.withDO(o.DO.Debug())
+}
+
+func (o originalMapDo) WithContext(ctx context.Context) IOriginalMapDo {
+	return o.withDO(o.DO.WithContext(ctx))
+}
+
+func (o originalMapDo) ReadDB() IOriginalMapDo {
+	return o.Clauses(dbresolver.Read)
+}
+
+func (o originalMapDo) WriteDB() IOriginalMapDo {
+	return o.Clauses(dbresolver.Write)
+}
+
+func (o originalMapDo) Session(config *gorm.Session) IOriginalMapDo {
+	return o.withDO(o.DO.Session(config))
+}
+
+func (o originalMapDo) Clauses(conds ...clause.Expression) IOriginalMapDo {
+	return o.withDO(o.DO.Clauses(conds...))
+}
+
+func (o originalMapDo) Returning(value interface{}, columns ...string) IOriginalMapDo {
+	return o.withDO(o.DO.Returning(value, columns...))
+}
+
+func (o originalMapDo) Not(conds ...gen.Condition) IOriginalMapDo {
+	return o.withDO(o.DO.Not(conds...))
+}
+
+func (o originalMapDo) Or(conds ...gen.Condition) IOriginalMapDo {
+	return o.withDO(o.DO.Or(conds...))
+}
+
+func (o originalMapDo) Select(conds ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Select(conds...))
+}
+
+func (o originalMapDo) Where(conds ...gen.Condition) IOriginalMapDo {
+	return o.withDO(o.DO.Where(conds...))
+}
+
+func (o originalMapDo) Order(conds ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Order(conds...))
+}
+
+func (o originalMapDo) Distinct(cols ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Distinct(cols...))
+}
+
+func (o originalMapDo) Omit(cols ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Omit(cols...))
+}
+
+func (o originalMapDo) Join(table schema.Tabler, on ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Join(table, on...))
+}
+
+func (o originalMapDo) LeftJoin(table schema.Tabler, on ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.LeftJoin(table, on...))
+}
+
+func (o originalMapDo) RightJoin(table schema.Tabler, on ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.RightJoin(table, on...))
+}
+
+func (o originalMapDo) Group(cols ...field.Expr) IOriginalMapDo {
+	return o.withDO(o.DO.Group(cols...))
+}
+
+func (o originalMapDo) Having(conds ...gen.Condition) IOriginalMapDo {
+	return o.withDO(o.DO.Having(conds...))
+}
+
+func (o originalMapDo) Limit(limit int) IOriginalMapDo {
+	return o.withDO(o.DO.Limit(limit))
+}
+
+func (o originalMapDo) Offset(offset int) IOriginalMapDo {
+	return o.withDO(o.DO.Offset(offset))
+}
+
+func (o originalMapDo) Scopes(funcs ...func(gen.Dao) gen.Dao) IOriginalMapDo {
+	return o.withDO(o.DO.Scopes(funcs...))
+}
+
+func (o originalMapDo) Unscoped() IOriginalMapDo {
+	return o.withDO(o.DO.Unscoped())
+}
+
+func (o originalMapDo) Create(values ...*model.OriginalMap) error {
+	if len(values) == 0 {
+		return nil
+	}
+	return o.DO.Create(values)
+}
+
+func (o originalMapDo) CreateInBatches(values []*model.OriginalMap, batchSize int) error {
+	return o.DO.CreateInBatches(values, batchSize)
+}
+
+// Save : !!! underlying implementation is different with GORM
+// The method is equivalent to executing the statement: db.Clauses(clause.OnConflict{UpdateAll: true}).Create(values)
+func (o originalMapDo) Save(values ...*model.OriginalMap) error {
+	if len(values) == 0 {
+		return nil
+	}
+	return o.DO.Save(values)
+}
+
+func (o originalMapDo) First() (*model.OriginalMap, error) {
+	if result, err := o.DO.First(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.OriginalMap), nil
+	}
+}
+
+func (o originalMapDo) Take() (*model.OriginalMap, error) {
+	if result, err := o.DO.Take(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.OriginalMap), nil
+	}
+}
+
+func (o originalMapDo) Last() (*model.OriginalMap, error) {
+	if result, err := o.DO.Last(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.OriginalMap), nil
+	}
+}
+
+func (o originalMapDo) Find() ([]*model.OriginalMap, error) {
+	result, err := o.DO.Find()
+	return result.([]*model.OriginalMap), err
+}
+
+func (o originalMapDo) FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.OriginalMap, err error) {
+	buf := make([]*model.OriginalMap, 0, batchSize)
+	err = o.DO.FindInBatches(&buf, batchSize, func(tx gen.Dao, batch int) error {
+		defer func() { results = append(results, buf...) }()
+		return fc(tx, batch)
+	})
+	return results, err
+}
+
+func (o originalMapDo) FindInBatches(result *[]*model.OriginalMap, batchSize int, fc func(tx gen.Dao, batch int) error) error {
+	return o.DO.FindInBatches(result, batchSize, fc)
+}
+
+func (o originalMapDo) Attrs(attrs ...field.AssignExpr) IOriginalMapDo {
+	return o.withDO(o.DO.Attrs(attrs...))
+}
+
+func (o originalMapDo) Assign(attrs ...field.AssignExpr) IOriginalMapDo {
+	return o.withDO(o.DO.Assign(attrs...))
+}
+
+func (o originalMapDo) Joins(fields ...field.RelationField) IOriginalMapDo {
+	for _, _f := range fields {
+		o = *o.withDO(o.DO.Joins(_f))
+	}
+	return &o
+}
+
+func (o originalMapDo) Preload(fields ...field.RelationField) IOriginalMapDo {
+	for _, _f := range fields {
+		o = *o.withDO(o.DO.Preload(_f))
+	}
+	return &o
+}
+
+func (o originalMapDo) FirstOrInit() (*model.OriginalMap, error) {
+	if result, err := o.DO.FirstOrInit(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.OriginalMap), nil
+	}
+}
+
+func (o originalMapDo) FirstOrCreate() (*model.OriginalMap, error) {
+	if result, err := o.DO.FirstOrCreate(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.OriginalMap), nil
+	}
+}
+
+func (o originalMapDo) FindByPage(offset int, limit int) (result []*model.OriginalMap, count int64, err error) {
+	result, err = o.Offset(offset).Limit(limit).Find()
+	if err != nil {
+		return
+	}
+
+	if size := len(result); 0 < limit && 0 < size && size < limit {
+		count = int64(size + offset)
+		return
+	}
+
+	count, err = o.Offset(-1).Limit(-1).Count()
+	return
+}
+
+func (o originalMapDo) ScanByPage(result interface{}, offset int, limit int) (count int64, err error) {
+	count, err = o.Count()
+	if err != nil {
+		return
+	}
+
+	err = o.Offset(offset).Limit(limit).Scan(result)
+	return
+}
+
+func (o originalMapDo) Scan(result interface{}) (err error) {
+	return o.DO.Scan(result)
+}
+
+func (o originalMapDo) Delete(models ...*model.OriginalMap) (result gen.ResultInfo, err error) {
+	return o.DO.Delete(models)
+}
+
+func (o *originalMapDo) withDO(do gen.Dao) *originalMapDo {
+	o.DO = *do.(*gen.DO)
+	return o
+}

biz/model/original_map.go

@@ -0,0 +1,43 @@
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+
+package model
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+const TableNameOriginalMap = "original_map"
+
+// OriginalMap mapped from table <original_map>
+type OriginalMap struct {
+	ID            string         `gorm:"column:id;type:varchar(100);primaryKey" json:"id"`
+	DeviceNo      string         `gorm:"column:device_no;type:varchar(100);not null" json:"device_no"`
+	DeviceName    string         `gorm:"column:device_name;type:varchar(100);not null" json:"device_name"`
+	DeviceType    string         `gorm:"column:device_type;type:varchar(100);not null" json:"device_type"`
+	MapID         string         `gorm:"column:map_id;type:varchar(100);not null" json:"map_id"`
+	MapType       string         `gorm:"column:map_type;type:varchar(50);not null" json:"map_type"`
+	MapName       string         `gorm:"column:map_name;type:varchar(255);not null" json:"map_name"`
+	FloorID       string         `gorm:"column:floor_id;type:varchar(100);not null" json:"floor_id"`
+	Floor         string         `gorm:"column:floor;type:varchar(100);not null" json:"floor"`
+	BuildID       string         `gorm:"column:build_id;type:varchar(100);not null" json:"build_id"`
+	BuildName     string         `gorm:"column:build_name;type:varchar(100);not null" json:"build_name"`
+	MapCreateTime string         `gorm:"column:map_create_time;type:varchar(100);not null" json:"map_create_time"`
+	MapUpdateTime string         `gorm:"column:map_update_time;type:varchar(100);not null" json:"map_update_time"`
+	MapVersion    string         `gorm:"column:map_version;type:varchar(100);not null" json:"map_version"`
+	PjiMapZipURL  string         `gorm:"column:pji_map_zip_url;type:varchar(255);not null" json:"pji_map_zip_url"`
+	CustomAreaID  int32          `gorm:"column:custom_area_id;type:int(11);not null" json:"custom_area_id"`
+	CreatedAt     time.Time      `gorm:"column:created_at;type:datetime;not null" json:"created_at"`
+	UpdatedAt     *time.Time     `gorm:"column:updated_at;type:datetime" json:"updated_at"`
+	DeletedAt     gorm.DeletedAt `gorm:"column:deleted_at;type:datetime" json:"deleted_at"`
+	CicvMapPgmURL *string        `gorm:"column:cicv_map_pgm_url;type:varchar(255)" json:"cicv_map_pgm_url"`
+	CicvMapZipURL *string        `gorm:"column:cicv_map_zip_url;type:varchar(255)" json:"cicv_map_zip_url"`
+}
+
+// TableName OriginalMap's table name
+func (*OriginalMap) TableName() string {
+	return TableNameOriginalMap
+}

common/config/c_oss.go

@@ -21,9 +21,10 @@ var (
 )
 
 var (
-	WorldOssBasePrefix      = "world"
-	SimulationOssBasePrefix = "simulation"
-	UpdateMapOssBasePrefix  = "update_map"
+	WorldOssBasePrefix       = "pji_desktop/world"
+	SimulationOssBasePrefix  = "pji_desktop/simulation"
+	UpdateMapOssBasePrefix   = "pji_desktop/update_map"
+	OriginalMapOssBasePrefix = "pji_desktop/original_map"
 )
 
 func InitOssConfig() {

common/config/c_pji/c_pji.go

@@ -8,5 +8,6 @@ var (
 
 	Token = "4773hd92ysj54paflw2jem3onyhywxt2"
 
-	PjiApiSitBaseUrl = "https://sitwebapi.chinapji.com/webapi/openapi/console/v1/loop/"
+	//PjiApiBaseUrl = "https://sitwebapi.chinapji.com/webapi/openapi/console/v1/loop/" //sit
+	PjiApiBaseUrl = "https://webapi.chinapji.com/webapi/openapi/console/v1/loop/" //客户环境
 )

gen/main.go

@@ -53,9 +53,10 @@ func main() {
 	Device := g.GenerateModel("device")
 	DeviceMap := g.GenerateModel("device_map")
 	SystemConfig := g.GenerateModel("system_config")
+	OriginalMap := g.GenerateModel("original_map")
 
 	// 创建模型的方法,生成文件在 query 目录; 先创建结果不会被后创建的覆盖
-	g.ApplyBasic(MapUpdate, World, SimulationTestRecord, Device, DeviceMap, SystemConfig)
+	g.ApplyBasic(MapUpdate, World, SimulationTestRecord, Device, DeviceMap, SystemConfig, OriginalMap)
 	//g.ApplyBasic(World)
 
 	g.Execute()

main.go

@@ -32,7 +32,13 @@ func main() {
 	_, err := c.AddFunc("@every 30m", func() {
 		// 发送地图续扫通知
 		flag := map_service.AddMapRescanNotifyWithoutHttp(ctx)
-		fmt.Println("flag", flag)
+		if flag {
+			fmt.Println("轮询地图续扫提醒结束")
+		}
+		flag = map_service.UploadOriginalMapWithoutHttp(ctx)
+		if flag {
+			fmt.Println("轮询上传原始地图结束")
+		}
 	})
 	if err != nil {
 		return

pji_client/pji_client.go

@@ -35,8 +35,10 @@ var (
 )
 
 var (
-	MapSecretId   = "bz765sfnx4wsr6axx91b09ugi56jvzqox"
-	MapPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ/7TuC6YrE6wX4qIyKi7ZmGl6cyYkmTwohCsvAnUdTK1l2uX2C4/lVybgFCp4dklZZgNewDDG8jMSp1KxXVUE4TxEJQQt8g1qx0JWPs1GPz5vP67yMndLbGfm360SDLjgnEBYKcpWe65f6eAPjFXgBrwdue2kZBHqTGRB8LwweVAgMBAAECgYABZx67RxHJJA7A9cr2aXSpPU45ym36NIV8KbmP9DL6KV0qgnZA+Yj2uYN6wgQzYmUSuyfojeOfWzD516qCYoB1wJYXXL3OgDP0HLJZ6WsZfIHC4uSfIRtfepccfGDxjWTCoQHYoHMC1uWww79XjqS6bnRgXCulG7itg9SHHfO2cQJBANVuktJq/bZJFGt7tXvV1IAqJ6Cc5zS62OmAeQ7YYJJIdh9xdtW0ASGzVS6Cj5wPfXp/SsfKl9ZGfql3BaeOzhsCQQC/46qqds6ztKfIAs1uKwB7M0SjASXLmO/+4dubvkabbyT4tcSqmAdOt0RqGb7/AgE6QU/an3IdbUcl/RXpLhwPAkBF0CZsd5zHzH3Gbq+9cwNQbPmLWudx4xBiyKhQh8yG7PbecCHb40ZffKaHUSOie5qiwBJ46bbi2ypBSnJqDZczAkBMEjhtXa4yJdNCAoJoQ1nsfXWfXWwbW6UBGY7THkqlghlZE85EhwKWnSbdHRnPxH6yFoROulkl+1VyZPPTvjjXAkEAryJwhKTIYXwc+cgUhWeLY/Yehj6iuwWwOfT9UbuwjnhKgKmn2tPnwY8JJcQQ99zBhQDWizj7Z9F+LlkMR6rlxw=="
+	//MapSecretId   = "bz765sfnx4wsr6axx91b09ugi56jvzqox" // sit
+	MapSecretId = "3vagisc9rpetc2s2154vts5ymybhiz7ie" // 客户环境
+	//MapPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJ/7TuC6YrE6wX4qIyKi7ZmGl6cyYkmTwohCsvAnUdTK1l2uX2C4/lVybgFCp4dklZZgNewDDG8jMSp1KxXVUE4TxEJQQt8g1qx0JWPs1GPz5vP67yMndLbGfm360SDLjgnEBYKcpWe65f6eAPjFXgBrwdue2kZBHqTGRB8LwweVAgMBAAECgYABZx67RxHJJA7A9cr2aXSpPU45ym36NIV8KbmP9DL6KV0qgnZA+Yj2uYN6wgQzYmUSuyfojeOfWzD516qCYoB1wJYXXL3OgDP0HLJZ6WsZfIHC4uSfIRtfepccfGDxjWTCoQHYoHMC1uWww79XjqS6bnRgXCulG7itg9SHHfO2cQJBANVuktJq/bZJFGt7tXvV1IAqJ6Cc5zS62OmAeQ7YYJJIdh9xdtW0ASGzVS6Cj5wPfXp/SsfKl9ZGfql3BaeOzhsCQQC/46qqds6ztKfIAs1uKwB7M0SjASXLmO/+4dubvkabbyT4tcSqmAdOt0RqGb7/AgE6QU/an3IdbUcl/RXpLhwPAkBF0CZsd5zHzH3Gbq+9cwNQbPmLWudx4xBiyKhQh8yG7PbecCHb40ZffKaHUSOie5qiwBJ46bbi2ypBSnJqDZczAkBMEjhtXa4yJdNCAoJoQ1nsfXWfXWwbW6UBGY7THkqlghlZE85EhwKWnSbdHRnPxH6yFoROulkl+1VyZPPTvjjXAkEAryJwhKTIYXwc+cgUhWeLY/Yehj6iuwWwOfT9UbuwjnhKgKmn2tPnwY8JJcQQ99zBhQDWizj7Z9F+LlkMR6rlxw=="
+	MapPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIsqA48Nbn1b88SVcwGR1qMXSWCpddHiiMfGcTRAYsWcbCG9y6WFQLVos5XOWI3YjRxxNKe3whQbJk/uxHrie+9cXxE+0LDA87H8MqbT9B13Fe9upW13u2OkL968Q2i2UqQ+BVThByanueZoJTr8jNHZwUDFrp/E+thNwJtM06yrAgMBAAECgYAIiBmyFkw3okCxGh/JW66xeUwrLBMdkXT6Q8Jim4SSrIgn5Ly3QpKY1zjp+RMOayrHhhyIyxK6bH8DooCS2g9n96Kg5R0MkRwAvCoHcdMt68ILGAf0nLdzB5Lefzt6YFI5SK6je3JYtCgc78SQ+qyCuMmEUJ/dWYfNdFSuOYSrwQJBAL9/Iil9+nOOgQ7Ro6Znove0jo0dwjDATZtVMBwRAeSWnGvrBeYflWjSB3b+It2EKaguwDpvG2XWlS9cv53b3msCQQC6CjfXk0bXqj90WCYiqqoInbzMDfZl48WHLXHS3P5/SlKhFAsTIKWyxjOgyRY8ptldBZ6kBazeq4V92WOmtnrBAkEAg2RQ5VVKDhW+GZPgDKJZYEqj8NF1V4vq8+SckPVebiClDSsCLiaHlpddhdjTxVgUWRBS1wU7MEHutMOXulGNJwJAUM8tcGtdo0IlK/E6J2bAUtvJbU1HUPy+CTiZL4Gk3j+3YpZlNRrCPsRPGrEeApxq4DgXr6FzdIlGg+LQoVK0QQJAHQUnrLwftprRcJ1W1xVQqka/EY8/T6Cljh6BPRhLTK6TtXFUSUTcQTeFffW7JH/E4Pz3q3oiEeDI5QlRjCVLjg=="
 )
 
 func InitApiClient() {
@@ -223,7 +225,7 @@ func (c *SysUserApiClient) GetRequest(url string, paramMap map[string]interface{
 func (c *SysUserApiClient) UploadRequest(url string, paramMap map[string]interface{}, secretId string, file []byte) (*protocol.Response, error) {
 	paramMap = sortMapByKey(paramMap)
 	jsonData, err := json.Marshal(paramMap)
-	//fmt.Println("jsonData", string(jsonData))
+	fmt.Println("jsonData", string(jsonData))
 	if err != nil {
 		return nil, err
 	}

router.go

@@ -38,6 +38,7 @@ func customizedRegister(r *server.Hertz) {
 
 	r.GET("/map/update/deviceMap/test", map_service.UpdateDeviceMapById)
 	r.GET("/map/update/deviceMap/record", map_service.UpdateDeviceMap)
+	r.GET("/map/update/originalMap/record", map_service.UpdateOriginalMap)
 	r.GET("/map/update/pji/upload", map_service.UploadPjiMapAndNotify)
 
 	r.GET("/map/rescan/notify/add", map_service.AddMapRescanNotifyWithHttp)