新增多个上传类型

controllers/sync.go

 	}
 
 }
+
+// 同步设备
+func (c *SyncController) SyncOtherMachine(rdb *gorm.DB, org_id int64, hospital_id int64) {
+	// 第一步：根据机构id获取上次同步时间
+	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 13)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 0
+	}
+
+	//同步设备
+	waterMachine, _ := service.FindOrgOtherMachineData(org_id, sync_time, time.Now().Unix())
+	var wms []*sz.TempHdOtherMachine
+	for _, item := range waterMachine {
+		wm := &sz.TempHdOtherMachine{
+			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			EquipmentId:    strconv.FormatInt(item.ID, 10),
+			EquipmentBrand: item.ManufactureFactory,
+			EquipmentModel: strconv.FormatInt(item.UnitType, 10),
+			EnableTime:     time.Unix(item.StartDate, 0),
+			DiscardedTime:  time.Unix(item.RubbishDate, 0),
+			CreateTime:     time.Now(),
+			UpdateTime:     time.Now(),
+			Sjscsj:         time.Now(),
+			Xgbz:           strconv.FormatInt(0, 10),
+		}
+		switch item.MachineStatus {
+		case 1:
+			wm.Status = "1"
+			break
+		case 4:
+			wm.Status = "3"
+			break
+		}
+
+		wms = append(wms, wm)
+	}
+
+	err := service.BatchCreateOtherMachineRecord(wms, rdb)
+	if err == nil {
+		// 第三步：同步成功后，添加同步记录
+		upload := &sz.DataUpload{
+			SyncType:       13,
+			OrgId:          org_id,
+			SyncTime:       time.Now().Unix(),
+			SyncResultType: 1,
+			CreateTime:     time.Now().Unix(),
+			UpdateTime:     time.Now().Unix(),
+		}
+		err := service.CreateUploadRecord(upload)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+		}
+	} else {
+		//错误处理
+
+	}
+
+}
+
+// 同步维修
+func (c *SyncController) SyncMachineRepair(rdb *gorm.DB, org_id int64, hospital_id int64) {
+	// 第一步：根据机构id获取上次同步时间
+	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 11)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 0
+	}
+
+	//同步设备
+	hdMaintain, _ := service.FindOrgMachineRepairData(org_id, sync_time, time.Now().Unix())
+	var maintain []*sz.TempHdMaintain
+	for _, item := range hdMaintain {
+		mt := &sz.TempHdMaintain{
+			HospitalId:  strconv.FormatInt(hospital_id, 10),
+			EquipmentId: strconv.FormatInt(item.VMDeviceAddmacher.ID, 10),
+			RepairTime:  time.Unix(item.GuaranteeDate, 0),
+			CreateTime:  time.Now(),
+			Sjscsj:      time.Now(),
+			Xgbz:        strconv.FormatInt(0, 10),
+		}
+		switch item.VMDeviceAddmacher.DeviceType {
+		case 1:
+			mt.EquipmentType = "11"
+			break
+		case 2:
+			mt.EquipmentType = "21"
+			break
+		case 3:
+			mt.EquipmentType = "99"
+			break
+		}
+
+		maintain = append(maintain, mt)
+	}
+
+	err := service.BatchCreateMainTain(maintain, rdb)
+	if err == nil {
+		// 第三步：同步成功后，添加同步记录
+		upload := &sz.DataUpload{
+			SyncType:       11,
+			OrgId:          org_id,
+			SyncTime:       time.Now().Unix(),
+			SyncResultType: 1,
+			CreateTime:     time.Now().Unix(),
+			UpdateTime:     time.Now().Unix(),
+		}
+		err := service.CreateUploadRecord(upload)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+		}
+	} else {
+		//错误处理
+
+	}
+
+}
+
+// 同步设备
+func (c *SyncController) SyncDM(rdb *gorm.DB, org_id int64, hospital_id int64) {
+	// 第一步：根据机构id获取上次同步时间
+	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 5)
+	var sync_time int64
+	if syncLastInfo.ID > 0 {
+		sync_time = syncLastInfo.SyncTime
+	} else {
+		sync_time = 0
+	}
+
+	//同步设备
+	dm, _ := service.FindOrgMachineData(org_id, sync_time, time.Now().Unix())
+	var hdms []*sz.TempHdDm
+	for _, item := range dm {
+		hdm := &sz.TempHdDm{
+			HospitalId:     strconv.FormatInt(hospital_id, 10),
+			EquipmentId:    strconv.FormatInt(item.ID, 10),
+			SickbedNo:      item.DeviceNumber.Number,
+			EquipmentBrand: item.ManufactureFactory,
+			EquipmentModel: strconv.FormatInt(item.UnitType, 10),
+			EnableTime:     time.Unix(item.StartDate, 0),
+			DiscardedTime:  time.Unix(item.RubbishDate, 0),
+			CreateTime:     time.Now(),
+			UpdateTime:     time.Now(),
+			Sjscsj:         time.Now(),
+			Xgbz:           strconv.FormatInt(0, 10),
+		}
+
+		switch item.MachineStatus {
+		case 1:
+			hdm.Status = "1"
+			break
+		case 4:
+			hdm.Status = "3"
+			break
+		}
+
+		switch item.DeviceType {
+		case 1:
+			hdm.EquipmentType = "11"
+			break
+		case 2:
+			hdm.EquipmentType = "98"
+			break
+		case 3:
+			hdm.EquipmentType = "99"
+			break
+		}
+
+		hdms = append(hdms, hdm)
+	}
+
+	err := service.BatchCreateHDMRecord(hdms, rdb)
+	if err == nil {
+		// 第三步：同步成功后，添加同步记录
+		upload := &sz.DataUpload{
+			SyncType:       5,
+			OrgId:          org_id,
+			SyncTime:       time.Now().Unix(),
+			SyncResultType: 1,
+			CreateTime:     time.Now().Unix(),
+			UpdateTime:     time.Now().Unix(),
+		}
+		err := service.CreateUploadRecord(upload)
+		if err != nil {
+			utils.ErrorLog("%v", err)
+		}
+	} else {
+		//错误处理
+
+	}
+
+}

models/src_data.go

 }
 
 type VMDeviceAddmacher struct {
-	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
-	SerialNumber        string `gorm:"column:serial_number" json:"serial_number" form:"serial_number"`
-	DeviceType          int64  `gorm:"column:device_type" json:"device_type" form:"device_type"`
-	BedNumber           string `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
-	DeviceName          string `gorm:"column:device_name" json:"device_name" form:"device_name"`
-	ManufactureFactory  string `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
-	ServiceManufacturer string `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
-	UnitType            int64  `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
-	UseSection          string `gorm:"column:use_section" json:"use_section" form:"use_section"`
-	SectionNumber       string `gorm:"column:section_number" json:"section_number" form:"section_number"`
-	BuyDate             int64  `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`
-	InstallDate         int64  `gorm:"column:install_date" json:"install_date" form:"install_date"`
-	StartDate           int64  `gorm:"column:start_date" json:"start_date" form:"start_date"`
-	MaintenaceEngineer  string `gorm:"column:maintenace_engineer" json:"maintenace_engineer" form:"maintenace_engineer"`
-	Telephone           string `gorm:"column:telephone" json:"telephone" form:"telephone"`
-	GuaranteeDate       string `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
-	MachineStatus       int64  `gorm:"column:machine_status" json:"machine_status" form:"machine_status"`
-	UserTotal           string `gorm:"column:user_total" json:"user_total" form:"user_total"`
-	DisinfectionMode    int64  `gorm:"column:disinfection_mode" json:"disinfection_mode" form:"disinfection_mode"`
-	Remarks             string `gorm:"column:remarks" json:"remarks" form:"remarks"`
-	RubbishDate         int64  `gorm:"column:rubbish_date" json:"rubbish_date" form:"rubbish_date"`
-	RubbishReason       int64  `gorm:"column:rubbish_reason" json:"rubbish_reason" form:"rubbish_reason"`
-	UserYear            string `gorm:"column:user_year" json:"user_year" form:"user_year"`
-	WorkTime            string `gorm:"column:work_time" json:"work_time" form:"work_time"`
-	ReversMode          int64  `gorm:"column:revers_mode" json:"revers_mode" form:"revers_mode"`
-	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status              int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	ZoneId              int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
-	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	ID                  int64        `gorm:"column:id" json:"id" form:"id"`
+	SerialNumber        string       `gorm:"column:serial_number" json:"serial_number" form:"serial_number"`
+	DeviceType          int64        `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	BedNumber           string       `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	DeviceName          string       `gorm:"column:device_name" json:"device_name" form:"device_name"`
+	ManufactureFactory  string       `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
+	ServiceManufacturer string       `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
+	UnitType            int64        `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	UseSection          string       `gorm:"column:use_section" json:"use_section" form:"use_section"`
+	SectionNumber       string       `gorm:"column:section_number" json:"section_number" form:"section_number"`
+	BuyDate             int64        `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`
+	InstallDate         int64        `gorm:"column:install_date" json:"install_date" form:"install_date"`
+	StartDate           int64        `gorm:"column:start_date" json:"start_date" form:"start_date"`
+	MaintenaceEngineer  string       `gorm:"column:maintenace_engineer" json:"maintenace_engineer" form:"maintenace_engineer"`
+	Telephone           string       `gorm:"column:telephone" json:"telephone" form:"telephone"`
+	GuaranteeDate       string       `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	MachineStatus       int64        `gorm:"column:machine_status" json:"machine_status" form:"machine_status"`
+	UserTotal           string       `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	DisinfectionMode    int64        `gorm:"column:disinfection_mode" json:"disinfection_mode" form:"disinfection_mode"`
+	Remarks             string       `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	RubbishDate         int64        `gorm:"column:rubbish_date" json:"rubbish_date" form:"rubbish_date"`
+	RubbishReason       int64        `gorm:"column:rubbish_reason" json:"rubbish_reason" form:"rubbish_reason"`
+	UserYear            string       `gorm:"column:user_year" json:"user_year" form:"user_year"`
+	WorkTime            string       `gorm:"column:work_time" json:"work_time" form:"work_time"`
+	ReversMode          int64        `gorm:"column:revers_mode" json:"revers_mode" form:"revers_mode"`
+	UserOrgId           int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status              int64        `gorm:"column:status" json:"status" form:"status"`
+	Ctime               int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ZoneId              int64        `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	BedId               int64        `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	DeviceNumber        DeviceNumber `gorm:"ForeignKey:ID;AssociationForeignKey:BedId"`
 }
 
 func (VMDeviceAddmacher) TableName() string {
 	return "xt_device_addmacher"
 }
+
+type DeviceRepair struct {
+	ID                int64             `gorm:"column:id" json:"id" form:"id"`
+	GuaranteeDate     int64             `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	StartTime         int64             `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	ArriveTime        int64             `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
+	FinishTime        int64             `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
+	TotalDistance     string            `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
+	FailureStage      int64             `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription  string            `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CauseAnalysis     string            `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
+	TreatmentProcess  string            `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
+	Images            string            `gorm:"column:images" json:"images" form:"images"`
+	Exclude           int64             `gorm:"column:exclude" json:"exclude" form:"exclude"`
+	Reason            string            `gorm:"column:reason" json:"reason" form:"reason"`
+	Ctime             int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64             `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId         int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	BedId             int64             `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId       int64             `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	CodeInformation   string            `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	ImageName         string            `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	VMDeviceAddmacher VMDeviceAddmacher `gorm:"ForeignKey:ID;AssociationForeignKey:EquitmentId"`
+}
+
+func (DeviceRepair) TableName() string {
+	return "xt_device_repair"
+}

service/city_data_uoload_service.go

 
 func FindOrgWaterMachineData(org_id int64, lastUploadTime int64, nowTime int64) (waterMachine []*models.VMDeviceAddmacher, err error) {
 
-	db := readDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ?", org_id)
+	db := readUserDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ? AND  device_type = 2", org_id)
 
 	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
 
 	}
 	return
 }
+
+func FindOrgOtherMachineData(org_id int64, lastUploadTime int64, nowTime int64) (waterMachine []*models.VMDeviceAddmacher, err error) {
+
+	db := readUserDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ? AND (device_type = 1 OR device_type = 3)", org_id)
+
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+
+	err = db.Find(&waterMachine).Error
+
+	return
+}
+
+func FindOrgMachineRepairData(org_id int64, lastUploadTime int64, nowTime int64) (waterMachine []*models.DeviceRepair, err error) {
+	db := readUserDb.Model(&models.DeviceRepair{}).Where("status = 1 AND  user_org_id = ?", org_id).Preload("VMDeviceAddmacher", "status = 1")
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+	err = db.Find(&waterMachine).Error
+	return
+}
+
+func BatchCreateOtherMachineRecord(wms []*sz.TempHdOtherMachine, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb.Begin()
+		if len(wms) > 0 {
+			thisSQL := "INSERT INTO t_hd_wm (HOSPITAL_ID, EQUIPMENT_ID, EQUIPMENT_BRAND, EQUIPMENT_MODEL, ENABLE_TIME,DISCARDED_TIME,XGBZ,CREATE_TIME,UPDATE_TIME,SJSCSJ) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, wm := range wms {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.EquipmentId)
+				insertData = append(insertData, wm.EquipmentBrand)
+				insertData = append(insertData, wm.EquipmentModel)
+				insertData = append(insertData, wm.EnableTime)
+				insertData = append(insertData, wm.DiscardedTime)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
+func BatchCreateMainTain(maintain []*sz.TempHdMaintain, rdb *gorm.DB) (err error) {
+	if len(maintain) > 0 {
+		utx := rdb.Begin()
+		if len(maintain) > 0 {
+			thisSQL := "INSERT INTO t_hd_maintain (HOSPITAL_ID, EQUIPMENT_ID, EQUIPMENT_TYPE, REPAIR_TIME, XGBZ,CREATE_TIME,SJSCSJ) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, wm := range maintain {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.EquipmentId)
+				insertData = append(insertData, wm.EquipmentType)
+				insertData = append(insertData, wm.RepairTime)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.Sjscsj)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
+func FindOrgMachineData(org_id int64, lastUploadTime int64, nowTime int64) (waterMachine []*models.VMDeviceAddmacher, err error) {
+
+	db := readUserDb.Model(&models.VMDeviceAddmacher{}).Where("status = 1 AND  user_org_id = ?", org_id).Preload("DeviceNumber", "status = 1")
+
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+
+	err = db.Find(&waterMachine).Error
+
+	return
+}
+
+func BatchCreateHDMRecord(wms []*sz.TempHdDm, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb.Begin()
+		if len(wms) > 0 {
+			thisSQL := "INSERT INTO t_hd_dm (HOSPITAL_ID, EQUIPMENT_ID,SICKBED_NO, EQUIPMENT_BRAND, EQUIPMENT_MODEL, ENABLE_TIME,DISCARDED_TIME,STATUS,EQUIPMENT_TYPE, XGBZ,CREATE_TIME,UPDATE_TIME,SJSCSJ) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, wm := range wms {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.EquipmentId)
+				insertData = append(insertData, wm.SickbedNo)
+				insertData = append(insertData, wm.EquipmentBrand)
+				insertData = append(insertData, wm.EquipmentModel)
+				insertData = append(insertData, wm.EnableTime)
+				insertData = append(insertData, wm.DiscardedTime)
+				insertData = append(insertData, wm.Status)
+				insertData = append(insertData, wm.EquipmentType)
+
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}