体积小

conf/app.conf

@@ -113,6 +113,21 @@ writepatientuser = syh
 writepatientpass = xhPECP2nFObR8aUK
 writepatientname = sgj_cdm
 
+
+readswshost = shengws1.mysql.rds.aliyuncs.com
+readswsport = 3306
+readswsuser = syh
+readswspass = xhPECP2nFObR8aUK
+readswsname = shengws
+
+
+
+writeswshost = shengws1.mysql.rds.aliyuncs.com
+writeswsport = 3306
+writeswsuser = syh
+writeswspass = xhPECP2nFObR8aUK
+writeswsname = shengws
+
 redishost = 349e580b2a524290.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP

controllers/gobal_config_api_controller.go

@@ -1682,6 +1682,7 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
+
 	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -59,6 +59,10 @@ func XcxApiControllersRegisterRouters() {
 	//检验检查
 	beego.Router("/xcx/api/mobile/getinspectionlist", &XcxApiController{}, "Get:GetInspectionList")
 
+	//肾有杯
+	beego.Router("/xcx/api/mobile/getarticlist", &XcxApiController{}, "Get:GetArticList")
+
+	beego.Router("/xcx/api/mobile/getarticlistdetail", &XcxApiController{}, "Get:GetArticListDetail")
 }
 
 type XcxApiController struct {
@@ -885,3 +889,24 @@ func (this *XcxApiController) GetInspectionList() {
 		"list": list,
 	})
 }
+
+func (this *XcxApiController) GetArticList() {
+
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	activity_id, _ := this.GetInt64("activity_id")
+	list, total, _ := service.GetArticList(activity_id, page, limit)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (this *XcxApiController) GetArticListDetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, _ := service.GetArticListDetail(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"story": detail,
+	})
+}

models/his_models.go

@@ -1513,3 +1513,36 @@ type XcxDataConfig struct {
 func (XcxDataConfig) TableName() string {
 	return "xt_data_config"
 }
+
+// 故事表
+type SybStory struct {
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	UserId          int64   `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	ActivityId      int64   `gorm:"column:activity_id" json:"activity_id" form:"activity_id"`
+	Theme           int64   `gorm:"column:theme" json:"theme" form:"theme"`
+	Title           string  `gorm:"column:title" json:"title" form:"title"`
+	Image           string  `gorm:"column:image" json:"image" form:"image"`
+	Content         string  `gorm:"column:content" json:"content" form:"content"`
+	FirstVoteCount  int64   `gorm:"column:first_vote_count" json:"first_vote_count" form:"first_vote_count"`
+	SecondVoteCount int64   `gorm:"column:second_vote_count" json:"second_vote_count" form:"second_vote_count"`
+	FirstScore      int64   `gorm:"column:first_score" json:"first_score" form:"first_score"`
+	SecondScore     int64   `gorm:"column:second_score" json:"second_score" form:"second_score"`
+	Score           float64 `gorm:"column:score" json:"score" form:"score"`
+	RoseCount       int64   `gorm:"column:rose_count" json:"rose_count" form:"rose_count"`
+	CommentCount    int64   `gorm:"column:comment_count" json:"comment_count" form:"comment_count"`
+	AuditStatus     int64   `gorm:"column:audit_status" json:"audit_status" form:"audit_status"`
+	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"`
+	StoryNo         int64   `gorm:"column:story_no" json:"story_no" form:"story_no"`
+	Round           int64   `gorm:"column:round" json:"round" form:"round"`
+	Reason          string  `gorm:"column:reason" json:"reason" form:"reason"`
+	ReadWx          int64   `gorm:"column:read_wx" json:"read_wx" form:"read_wx"`
+	ReadApp         int64   `gorm:"column:read_app" json:"read_app" form:"read_app"`
+	ReadPc          int64   `gorm:"column:read_pc" json:"read_pc" form:"read_pc"`
+	PingweiNum      int64   `gorm:"column:pingwei_num" json:"pingwei_num" form:"pingwei_num"`
+}
+
+func (SybStory) TableName() string {
+	return "syb_story"
+}

models/service/db.go

@@ -41,6 +41,9 @@ var writeSgjPatientDb *gorm.DB
 var readUserDbT *gorm.DB
 var writeUserDbT *gorm.DB
 
+var readSwsDb *gorm.DB
+var writeSwsDb *gorm.DB
+
 var err error
 
 func ConnectDB() {
@@ -116,6 +119,18 @@ func ConnectDB() {
 	writeUserPassT := beego.AppConfig.String("writeuserpassTest")
 	writeUserNameT := beego.AppConfig.String("writeusernameTest")
 
+	readSwsHost := beego.AppConfig.String("readswshost")
+	readSwsPort := beego.AppConfig.String("readswsport")
+	readSwsUser := beego.AppConfig.String("readswsuser")
+	readSwsPass := beego.AppConfig.String("readswspass")
+	readSwsName := beego.AppConfig.String("readswsname")
+
+	writeSwsHost := beego.AppConfig.String("writeswshost")
+	writeSwsPort := beego.AppConfig.String("writeswsport")
+	writeSwsUser := beego.AppConfig.String("writeswsuser")
+	writeSwsPass := beego.AppConfig.String("writeswspass")
+	writeSwsName := beego.AppConfig.String("writeswsname")
+
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
 
@@ -134,7 +149,11 @@ func ConnectDB() {
 	rudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUserT, readUserPassT, readUserHostT, readUserPortT, readUserNameT)
 	wudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUserT, writeUserPassT, writeUserHostT, writeUserPortT, writeUserNameT)
 
+	rsdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readSwsUser, readSwsPass, readSwsHost, readSwsPort, readSwsName)
+	wsdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeSwsUser, writeSwsPass, writeSwsHost, writeSwsPort, writeSwsName)
+
 	readDb, err = gorm.Open("mysql", rdsn)
+
 	if err != nil {
 		//beego.Error(err)
 	}
@@ -229,6 +248,22 @@ func ConnectDB() {
 	writeSgjPatientDb.DB().SetMaxIdleConns(10)
 	writeSgjPatientDb.DB().SetMaxOpenConns(100)
 	writeSgjPatientDb.LogMode(true)
+
+	readSwsDb, err = gorm.Open("mysql", rsdsn)
+	if err != nil {
+		//beego.Error(err)
+	}
+	readSwsDb.DB().SetMaxIdleConns(10)
+	readSwsDb.DB().SetMaxOpenConns(100)
+	readSwsDb.LogMode(true)
+
+	writeSwsDb, err = gorm.Open("mysql", wsdsn)
+	if err != nil {
+		//beego.Error(err)
+	}
+	writeSwsDb.DB().SetMaxIdleConns(10)
+	writeSwsDb.DB().SetMaxOpenConns(100)
+	writeSwsDb.LogMode(true)
 }
 
 //func DisconnectDB() {

service/xcx_mobile_api_service.go

@@ -612,3 +612,17 @@ func GetInsepctionList(patientid int64, startime int64, endtime int64) (inspecti
 	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }
+
+func GetArticList(activityID int64, page int64, limit int64) (story []*models.SybStory, total int64, err error) {
+
+	offset := (page - 1) * limit
+	err = UserReadDB().Model(&story).Where("activity_id = ? and  audit_status = 2", activityID).Count(&total).Order("ctime desc").Offset(offset).Limit(limit).Find(&story).Error
+	return story, total, err
+}
+
+func GetArticListDetail(id int64) (models.SybStory, error) {
+
+	story := models.SybStory{}
+	err := UserReadDB().Where("id = ?", id).Find(&story).Error
+	return story, err
+}