gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gdxz:19afa0fc7ce65f099f7d73a11cc35278bd814f49
Branches Tags
gdxz:dev
gdxz:master
..
compare: gdxz:fce37aaa1bdf873ea4ee8fb96e9f8478ccb97b4a
Branches Tags
gdxz:dev
gdxz:master

No commits in common. "19afa0fc7ce65f099f7d73a11cc35278bd814f49" and "fce37aaa1bdf873ea4ee8fb96e9f8478ccb97b4a" have entirely different histories.
19afa0fc7c ... fce37aaa1b

1 changed files with 31 additions and 74 deletions
Show Stats Expand all files Collapse all files

105
api/service/UserCaCert.go
View File

@ -33,15 +33,7 @@ func (r *UserCaCertService) AddUserCloudCert(tx *gorm.DB, userId int64) (bool, e
maps["type"] = 2 maps["type"] = 2
userCaCert, _ := userCaCertDao.GetUserCaCert(maps) userCaCert, _ := userCaCertDao.GetUserCaCert(maps)
if userCaCert != nil { if userCaCert != nil {
if time.Time(userCaCert.CertExpireTime).IsZero() { return false, errors.New("医生存在正常使用的云证书，请注销后重新申请")
return false, errors.New("云证书过期时间错误")
}
now := time.Now()
certExpireTime := time.Time(userCaCert.CertExpireTime)
if now.Before(certExpireTime) {
return false, errors.New("云证书还未过期")
}
} }
// 获取用户数据 // 获取用户数据
@ -75,24 +67,6 @@ func (r *UserCaCertService) AddUserCloudCert(tx *gorm.DB, userId int64) (bool, e
departmentCustomId = userDoctor.DepartmentCustomId // 自定义科室id departmentCustomId = userDoctor.DepartmentCustomId // 自定义科室id
cardName = userDoctorInfo.CardName // 身份证名称 cardName = userDoctorInfo.CardName // 身份证名称
cardNum = userDoctorInfo.CardNum // 身份证号码 cardNum = userDoctorInfo.CardNum // 身份证号码
} else {
// 获取药师数据
userPharmacistDao := dao.UserPharmacistDao{}
userPharmacist, err := userPharmacistDao.GetUserPharmacistByUserId(userId)
if err != nil || userPharmacist == nil {
return false, errors.New("药师数据错误")
}
// 获取药师详情数据
userPharmacistInfoDao := dao.UserPharmacistInfoDao{}
userPharmacistInfo, err := userPharmacistInfoDao.GetUserPharmacistInfoByUserId(userId)
if err != nil || userPharmacistInfo == nil {
return false, errors.New("药师详情数据错误")
}
departmentCustomId = userPharmacist.DepartmentCustomId // 自定义科室id
cardName = userPharmacistInfo.CardName // 身份证名称
cardNum = userPharmacistInfo.CardNum // 身份证号码
} }
// 获取自定义科室数据 // 获取自定义科室数据
@ -139,39 +113,25 @@ func (r *UserCaCertService) AddUserCloudCert(tx *gorm.DB, userId int64) (bool, e
CertExpireTime = model.LocalTime(time.Now().AddDate(0, 0, 365)) CertExpireTime = model.LocalTime(time.Now().AddDate(0, 0, 365))
} }
if userCaCert == nil { // 新增ca监管证书表
// 新增ca监管证书表 userCaCert = &model.UserCaCert{
userCaCert = &model.UserCaCert{ UserId: &userId,
UserId: &userId, IsSystem: 0,
IsSystem: 0, IsLatest: 1,
IsLatest: 1, Type: 2,
Type: 2, CertBase64: cloudCertResponse.CertBase64,
CertBase64: cloudCertResponse.CertBase64, CertChainP7: cloudCertResponse.CertP7,
CertChainP7: cloudCertResponse.CertP7, CertSerialNumber: cloudCertResponse.CertSerialnumber,
CertSerialNumber: cloudCertResponse.CertSerialnumber, CaPin: fmt.Sprintf("%d", userId),
CaPin: fmt.Sprintf("%d", userId), IsSignConfig: 0,
IsSignConfig: 0, SignConfig: "",
SignConfig: "", CertApplicationTime: model.LocalTime(time.Now()),
CertApplicationTime: model.LocalTime(time.Now()), CertExpireTime: CertExpireTime, // 180天以后的时间
CertExpireTime: CertExpireTime, // 180天以后的时间 }
}
userCaCert, err = userCaCertDao.AddUserCaCert(tx, userCaCert) userCaCert, err = userCaCertDao.AddUserCaCert(tx, userCaCert)
if err != nil || userCaCert == nil { if err != nil || userCaCert == nil {
return false, errors.New(err.Error()) return false, errors.New(err.Error())
}
} else {
// 修改ca监管证书表
data := make(map[string]interface{})
data["cert_base64"] = cloudCertResponse.CertBase64
data["cert_chain_p7"] = cloudCertResponse.CertP7
data["cert_serial_number"] = cloudCertResponse.CertSerialnumber
data["cert_application_time"] = model.LocalTime(time.Now())
data["cert_expire_time"] = CertExpireTime
err = userCaCertDao.EditUserCaCertById(tx, userCaCert.CertId, data)
if err != nil {
return false, errors.New("审核失败")
}
} }
return true, nil return true, nil
@ -193,20 +153,18 @@ func (r *UserCaCertService) AddHospitalCloudCert(tx *gorm.DB) (bool, error) {
// 申请云证书 // 申请云证书
cloudCertRequestData := &ca.AddCloudCertRequest{ cloudCertRequestData := &ca.AddCloudCertRequest{
EntityId: fmt.Sprintf("%d", userId), EntityId: fmt.Sprintf("%d", userId),
EntityType: "Organizational", EntityType: "Organizational",
PersonalPhone: "18601047315", PersonalPhone: "18221234167",
PersonalName: "张晓彦", OrgName: "成都金牛欣欣相照互联网医院有限公司",
PersonalIdNumber: "132527197709270017", OrgNumber: "91510106MABTJY4K9R",
OrgName: "成都金牛欣欣相照互联网医院有限公司", Pin: fmt.Sprintf("%d", userId),
OrgNumber: "91510106MABTJY4K9R", Province: "四川省",
Pin: fmt.Sprintf("%d", userId), Locality: "成都市",
Province: "四川省", AuthType: "实人认证",
Locality: "成都市", AuthTime: strconv.FormatInt(time.Now().Unix(), 10),
AuthType: "实人认证", AuthResult: "认证通过",
AuthTime: strconv.FormatInt(time.Now().Unix(), 10), AuthNoticeType: "数字证书申请告知",
AuthResult: "认证通过",
AuthNoticeType: "数字证书申请告知",
} }
cloudCertResponse, err := ca.AddCloudCert(cloudCertRequestData) cloudCertResponse, err := ca.AddCloudCert(cloudCertRequestData)
@ -342,7 +300,6 @@ func (r *UserCaCertService) EditUserCloudCert(tx *gorm.DB, userId int64) (bool,
data["cert_base64"] = cloudCertResponse.CertBase64 data["cert_base64"] = cloudCertResponse.CertBase64
data["cert_chain_p7"] = cloudCertResponse.CertP7 data["cert_chain_p7"] = cloudCertResponse.CertP7
data["cert_serial_number"] = cloudCertResponse.CertSerialnumber data["cert_serial_number"] = cloudCertResponse.CertSerialnumber
err = userCaCertDao.EditUserCaCertById(tx, userCaCert.CertId, data) err = userCaCertDao.EditUserCaCertById(tx, userCaCert.CertId, data)
if err != nil { if err != nil {
return false, errors.New("审核失败") return false, errors.New("审核失败")