微网站

controllers/article/article_controller.go

@@ -972,7 +972,7 @@ func (this * ArticleManage) UpdateVidoInfo()  {
 	}
 	vioupload := dataBody["vio_upload"].(string)
 	fmt.Println("视频上传路径",vioupload)
-	vidpic := dataBody["vid_pic"].(string)+"?vframe/jpg/offset/1/w/300/h/200"
+	vidpic := dataBody["vid_pic"].(string)
 	fmt.Println("视频封面",vidpic)
 	if len(vidpic) == 0 {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
@@ -1180,6 +1180,9 @@ func (this * ArticleManage) GetReplyAllComents()  {
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构ID",userOrgID)
 	comment, total, err := article_service.GetReplyAllComents(userOrgID,page, limit)
+	fmt.Println("comment",comment)
+	fmt.Println("total",total)
+	fmt.Println("错误",err)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取评论列表失败")
 		return

controllers/micro/micro_controller.go

@@ -8,7 +8,7 @@ import (
 )
 
 func microRouters(){
-	beego.Router("/api/site/getdata",&Micro{},"Get:GetData")
+	beego.Router("/api/site/getdatabyorgid",&Micro{},"Get:GetDataByOrgId")
 	beego.Router("/api/site/getdatatwo",&Micro{},"Get:GetDatatwo")
 	beego.Router("/api/site/getdatathree",&Micro{},"Get:GetOfficeDetail")
 	beego.Router("/api/site/getdatafour",&Micro{},"Get:GetDoctorDetail")
@@ -23,7 +23,6 @@ func microRouters(){
 	beego.Router("/api/site/singleactivitinfo",&Micro{},"Get:GetActivitDetail")
 	beego.Router("/api/site/singlearticleinfo",&Micro{},"Get:GetArticlesDetail")
    beego.Router("/api/site/singledoctorinfo",&Micro{},"Get:GetDoctorInfo")
-   beego.Router("/api/site/getrotationlinkaddress",&Micro{},"Get:GetRotationLinkAddress")
 }
 
 type Micro struct {
@@ -41,7 +40,7 @@ func (this *Micro) ServeSuccessJSON(data map[string]interface{}) {
 }
 
 
-func (this *Micro) GetData(){
+func (this *Micro) GetDataByOrgId(){
 	fmt.Println("我和我的祖国")
 	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("小明id",orgid)
@@ -299,4 +298,6 @@ func (this *Micro) GetRotationLinkAddress()  {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"linkaddress":linkaddress,
 	})
-}
+}
+
+

controllers/site/site_controller.go

@@ -174,6 +174,9 @@ func siteRouters() {
 	beego.Router("/api/site/editrotationemages",&Microwebsite{},"Get:GeteditRotationEmages")
 	beego.Router("/api/site/getoutrotationlink",&Microwebsite{},"Get:GetOutRotationLink")
 	beego.Router("/api/site/updatedrolinkaddress",&Microwebsite{},"Post:UpdatedRolinkAddress")
+	beego.Router("/api/site/updatedconrotation",&Microwebsite{},"Post:UpdatedConrotation")
+	beego.Router("/api/site/getrotationvisiblebylinkid",&Microwebsite{},"Get:GetRotationVisibleByLinkId")
+	beego.Router("/api/site/addrotationvisibleform",&Microwebsite{},"Post:AddRotationVisibleForm")
 }
 
 type Microwebsite struct {
@@ -1427,9 +1430,11 @@ func (this *Microwebsite) Deletemodlebyid()  {
 	linkByModelid := site_service.DeleteEditPicLinkByModelid(id, userOrgID)
 	enviroments := site_service.DeleteEnviroments(id, userOrgID)
 	conrotation := site_service.DeleteConrotation(id, userOrgID)
+	margin := site_service.DeletePatentEditMargin(id, userOrgID)
 	fmt.Println("linkByModelid",linkByModelid)
 	fmt.Println("enviroments",enviroments)
 	fmt.Println("enviroments",conrotation)
+	fmt.Println("margin",margin)
 	fmt.Println(modelid,byModelid)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除成功")
@@ -1803,42 +1808,52 @@ func (this *Microwebsite) GetData()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
 	fmt.Println("机构ID机构ID机构ID机构IDvvvv机构ID机构ID机构ID机构ID机构ID机构ID" ,userOrgID)
-	model, err := site_service.GetData(userOrgID)
-	fmt.Println("model是什么",model)
-	fmt.Println("长度",len(model))
-	fmt.Println("err",err)
-	if(len(model) == 0){
-		patientModel := models.SgjPatientModel{
-			Title:     "轮播图",
-			Sort:      1,
-			UserOrgId: userOrgID,
-			Ctime:     time.Now().Unix(),
-			Status:    1,
-			ModeType:  1,
+	navigation, err := site_service.GetPatientNavigation(userOrgID)
+	fmt.Println("navigation是什么",len(navigation))
+	if(len(navigation) == 0){
+		patientNavigation := models.SgjPatientNavigation{
+			Navtitle:    "首页",
+			Navimages:   "https://images.shengws.com/2089_o_1571990714383.png",
+			Status:      1,
+			UserOrgId:   userOrgID,
+			Nonavimages: "https://images.shengws.com/2105_o_1571990730785.png",
+			Ctime:       time.Now().Unix(),
 		}
-		addPatientModel := site_service.AddPatientModelTwo(&patientModel)
-		fmt.Println("第一个模块id",addPatientModel)
-		sgjPatientModel, err := site_service.GetQueryModelByLastData(userOrgID)
-		fmt.Println("查询模块错误是设么",err)
-		editpiclink := models.SgjPatientEditpiclink{
-			Images:    "https://images.shengws.com/2124_o_1570607834870.png",
-			Sort:      1,
-			UserOrgId: userOrgID,
-			Status:    1,
-			Ctime:     time.Now().Unix(),
-			Modeid:sgjPatientModel.ID,
+		err = site_service.AddNavgation(&patientNavigation)
+		fmt.Println(err)
+		sgjPatientNavigation := models.SgjPatientNavigation{
+			Navtitle:    "消息",
+			Navimages:   "https://images.shengws.com/2124_o_1571990749565.png",
+			Status:      1,
+			UserOrgId:   userOrgID,
+			Nonavimages: "https://images.shengws.com/2079_o_1571990763549.png",
+			Ctime:       time.Now().Unix(),
 		}
-		err = site_service.AddPatientEdit(&editpiclink)
-		fmt.Println("err",err)
-		fmt.Println("editpiclink",editpiclink)
-		if err !=nil{
-			this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
-			return
+		err = site_service.AddNavgation(&sgjPatientNavigation)
+		patientnavigationtwo := models.SgjPatientNavigation{
+			Navtitle:    "电话",
+			Navimages:   "https://images.shengws.com/2092_o_1571990776921.png",
+			Status:      1,
+			UserOrgId:   userOrgID,
+			Nonavimages: "https://images.shengws.com/2100_o_1571990784845.png",
+			Ctime:       time.Now().Unix(),
+		}
+		err = site_service.AddNavgation(&patientnavigationtwo)
+		patientnavigationthree := models.SgjPatientNavigation{
+			Navtitle:    "客服",
+			Navimages:   "https://images.shengws.com/2101_o_1571990903053.png",
+			Status:      1,
+			UserOrgId:   userOrgID,
+			Nonavimages: "https://images.shengws.com/2113_o_1571990915581.png",
+			Ctime:       time.Now().Unix(),
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"patientModels":model,
-		})
+		err = site_service.AddNavgation(&patientnavigationthree)
 	}
+
+	model, err := site_service.GetData(userOrgID)
+	fmt.Println("model是什么",model)
+	fmt.Println("长度",len(model))
+	fmt.Println("err",err)
 	if (len(model) == 0){
 			patientModel := models.SgjPatientModel{
 				Title:     "轮播图",
@@ -1878,7 +1893,7 @@ func (this *Microwebsite) GetData()  {
 			fmt.Println(err)
 			editmargin := models.SgjPatientEditmargin{
 				Margtitle: "医院介绍",
-				Margimage: "https://images.shengws.com/2109_o_1569824063320.png",
+				Margimage: "https://images.shengws.com/2162_o_1571992616722.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1889,7 +1904,7 @@ func (this *Microwebsite) GetData()  {
 
 			patientEditmargin := models.SgjPatientEditmargin{
 				Margtitle: "医护团队",
-				Margimage: "https://images.shengws.com/2121_o_1569824193950.png",
+				Margimage: "https://images.shengws.com/2121_o_1571992634289.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1899,8 +1914,8 @@ func (this *Microwebsite) GetData()  {
 			fmt.Println(err)
 
 			sgjPatientEditmargin := models.SgjPatientEditmargin{
-				Margtitle: "科室介绍",
-				Margimage: "https://images.shengws.com/2113_o_1569824421007.png",
+				Margtitle: "医院动态",
+				Margimage: "https://images.shengws.com/2163_o_1571992676180.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1912,7 +1927,7 @@ func (this *Microwebsite) GetData()  {
 
 			patienteditmarginfour := models.SgjPatientEditmargin{
 				Margtitle: "医院活动",
-				Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
+				Margimage: "https://images.shengws.com/2117_o_1571992689392.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1924,7 +1939,7 @@ func (this *Microwebsite) GetData()  {
 
 			patienteditmarginfive := models.SgjPatientEditmargin{
 				Margtitle: "医院环境",
-				Margimage: "https://images.shengws.com/2131_o_1569824498886.png",
+				Margimage: "https://images.shengws.com/2130_o_1571992702226.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1935,8 +1950,8 @@ func (this *Microwebsite) GetData()  {
 			fmt.Println(err)
 
 			patienteditmarginsix := models.SgjPatientEditmargin{
-				Margtitle: "咨询服务",
-				Margimage: "https://images.shengws.com/2111_o_1569824596227.png",
+				Margtitle: "咨询客服",
+				Margimage: "https://images.shengws.com/2149_o_1571992721076.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1947,7 +1962,7 @@ func (this *Microwebsite) GetData()  {
 
 			patienteditmarginserven := models.SgjPatientEditmargin{
 				Margtitle: "加入会员",
-				Margimage: "https://images.shengws.com/2126_o_1569824611892.png",
+				Margimage: "https://images.shengws.com/2165_o_1571992737567.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -1959,7 +1974,7 @@ func (this *Microwebsite) GetData()  {
 
 			patienteditmargineghit := models.SgjPatientEditmargin{
 				Margtitle: "联系我们",
-				Margimage: "https://images.shengws.com/2141_o_1569824626531.png",
+				Margimage: "https://images.shengws.com/2122_o_1571992753168.png",
 				UserOrgId: userOrgID,
 				Status:    1,
 				Ctime:     time.Now().Unix(),
@@ -2061,6 +2076,44 @@ func (this *Microwebsite) GetData()  {
 			}
 			err = site_service.AddImages(&enviroimages)
 			fmt.Println("err",err)
+		//    modeleight := models.SgjPatientModel{
+		//	  Title:     "文章列表",
+		//	  Sort:      7,
+		//	  UserOrgId: userOrgID,
+		//	  Ctime:     time.Now().Unix(),
+		//	  Status:    1,
+		//	  ModeType:  6,
+	    	//}
+		//   err = site_service.AddPatientModelTwo(&modeleight)
+		//byLastData, err := site_service.GetQueryModelByLastData(userOrgID)
+		//fmt.Println(byLastData,err)
+		//articlelist := models.SgjPatientArticlelist{
+		//	Title:       "文章列表",
+		//	Sort:7,
+		//	UserOrgId:   userOrgID,
+		//	Status:      1,
+		//	Ctime:       time.Now().Unix(),
+		//	Number:      1,
+		//	Modeid:      byLastData.ID,
+		//}
+		//err = site_service.AddActiclelist(&articlelist)
+		//articles := models.Articles{
+		//	Title:     "文章列表",
+		//	UserOrgId: userOrgID,
+		//	Content:   "暂无数据",
+		//	Imgs:"https://images.shengws.com/2062_o_1570608303729.png",
+		//}
+		//err = site_service.AddActicles(&articles)
+		//fmt.Println("错误",err)
+		//modelnight := models.SgjPatientModel{
+		//	Title:     "活动列表",
+		//	Sort:      8,
+		//	UserOrgId: userOrgID,
+		//	Ctime:     time.Now().Unix(),
+		//	Status:    1,
+		//	ModeType:  7,
+		//}
+		//err = site_service.AddPatientModelTwo(&modelnight)
 	}
 	fmt.Println(model,err)
 	if err !=nil{
@@ -2557,6 +2610,7 @@ func (this *Microwebsite) AddNavigation()  {
 	fmt.Println("链接地址",navigationaddress)
 	linkid := int64(dataBody["linkid"].(float64))
 	fmt.Println("linkID",linkid)
+	linktype := int64(dataBody["linktype"].(float64))
 	navigation := models.SgjPatientNavigation{
 		Navtitle:   navtitle,
 		Navimages:  navigationImages,
@@ -2567,6 +2621,7 @@ func (this *Microwebsite) AddNavigation()  {
 		Status: 1,
 		Ctime:time.Now().Unix(),
 		Linkid:linkid,
+		Linktype:linktype,
 	}
 	err = site_service.AddNavigation(&navigation)
 	if err !=nil{
@@ -2664,6 +2719,7 @@ func (this *Microwebsite) DeleteNavition()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := int64(adminUserInfo.CurrentOrgId)
 	id, _ := this.GetInt64("id")
+	fmt.Println("id是什么呢",id)
 	err := site_service.DeleteNavitionById(userOrgID, id)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除成功")
@@ -3258,12 +3314,17 @@ func (this *Microwebsite) SaveNavigation()  {
 	}
 	navaddress := dataBody["navaddress"].(string)
 	fmt.Println("链接地址",navaddress)
+	linkid := int64(dataBody["linkid"].(float64))
+	fmt.Println("linkid是多少",linkid)
+	linktype := int64(dataBody["linktype"].(float64))
 	navigation := models.SgjPatientNavigation{
 		Navtitle:   navtitle,
 		Navimages:  navimages,
         Nonavimages:noCheckImages,
 		Jumpset:    jumpset,
 		Navaddress: navaddress,
+		Linkid:linkid,
+		Linktype:linktype,
 	}
 	err = site_service.UpdateNavtion(id, userOrgID, navigation)
 	navigations, err := site_service.GetDefaultNavigation(userOrgID)
@@ -4403,7 +4464,9 @@ func  (this *Microwebsite) Getlinkaddress()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构id",userOrgID)
-	linkaddress, err := site_service.GetLinkAddress(userOrgID)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id",id)
+	linkaddress, err := site_service.GetLinkAddress(userOrgID,id)
 	fmt.Println("错误",err)
 	fmt.Println("地址",linkaddress)
 	if err !=nil{
@@ -4666,6 +4729,8 @@ func  (this *Microwebsite) GetLinkAddressDetail()  {
 	id, _ := this.GetInt64("id")
 	fmt.Println("链接id",id)
 	conlinkaddress, err := site_service.GetLinkAddressDetail(userOrgID, id)
+	fmt.Println("错误",err)
+	fmt.Println("conlinkaddress",conlinkaddress)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return
@@ -4688,6 +4753,19 @@ func (this *Microwebsite) UpdatePicFformThree()  {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
+	defineaddress := dataBody["defineaddress"].(string)
+	fmt.Println("defineaddress",defineaddress)
+	conlinkaddress := models.SgjPatientConlinkaddress{
+		Defineaddress: defineaddress,
+	}
+	err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conlinkaddress":conlinkaddress,
+	})
 
 }
 
@@ -5041,6 +5119,7 @@ func  (this*Microwebsite) UpdateLinkAddress()  {
 		UserOrgId:userOrgID,
 		Status:1,
 	}
+	model, err := site_service.GetPatienModelByModelId(linkaddress, userOrgID)
 	patientMagiclink, err := site_service.GetMacLinkAddressTwo(userOrgID)
 	fmt.Println("长度",len(patientMagiclink))
 	if(len(patientMagiclink)== 0){
@@ -5057,6 +5136,7 @@ func  (this*Microwebsite) UpdateLinkAddress()  {
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"magiclink":magiclink,
+		"model":model,
 	})
 }
 
@@ -5131,7 +5211,7 @@ func (this*Microwebsite) GetCountImages()  {
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构id", userOrgID)
 	edipiclink, total, err := site_service.GetCountImages(userOrgID)
-	fmt.Println(edipiclink)
+	fmt.Println("edipiclink是什么",edipiclink)
 	fmt.Println("total是什么",total)
 	fmt.Println("err是什么",err)
 }
@@ -5214,8 +5294,11 @@ func (this*Microwebsite) UpdateditnavigationLink() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
-	id := int64(dataBody["id"].(float64))
+	//id := int64(dataBody["id"].(float64))
+		//fmt.Println("id是什么",id)
+	id, _ := this.GetInt64("id")
 	fmt.Println("id是什么",id)
+
 	linktype := int64(dataBody["linktype"].(float64))
 	fmt.Println("linktype",linktype)
 	navitionlinktype := int64(dataBody["navitionlinktype"].(float64))
@@ -5232,11 +5315,26 @@ func (this*Microwebsite) UpdateditnavigationLink() {
 		Outstationlink:   outstationlink,
 		Linkaddress:      linkaddress,
 		Phone:phone,
+		UserOrgId:userOrgID,
+		Status:1,
 	}
-	err = site_service.UpdateditnavigationLink(id, userOrgID, navgationlink)
-	if err !=nil{
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
-		return
+	patientNavgationlink, errcode := site_service.GetNavgationLinkById(id, userOrgID)
+	fmt.Println(patientNavgationlink,errcode)
+	if errcode == gorm.ErrRecordNotFound{
+		err = site_service.AddNavigationlink(&navgationlink)
+		fmt.Println("数据添加成功",err)
+	}else if errcode == nil {
+		err = site_service.UpdateditnavigationLink(id, userOrgID, navgationlink)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+			return
+		}
+	}else {
+		err = site_service.UpdateditnavigationLink(id, userOrgID, navgationlink)
+		if err !=nil{
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+			return
+		}
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"navgationlink":navgationlink,
@@ -5305,71 +5403,71 @@ func (this *Microwebsite) GetNavigationset()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	fmt.Println("机构id", userOrgID)
-	navigation, err := site_service.GetDefaultNavigation(userOrgID)
-	fmt.Println("错误是设么",err)
-	if (len(navigation) == 0) {
-		sgjPatientNavigation := models.SgjPatientNavigation{
-			Navtitle:   "首页",
-			Navimages:  "https://images.shengws.com/2099_o_1570840397245.png",
-			Nonavimages:"https://images.shengws.com/2099_o_1570840397245.png",
-			Jumpset:    1,
-			Navaddress: "",
-			Ctime:      time.Now().Unix(),
-			Status:     1,
-			UserOrgId:  userOrgID,
-		}
-		err = site_service.AddDefaultData(&sgjPatientNavigation)
-		patientNavigation := models.SgjPatientNavigation{
-			Navtitle:   "微商城",
-			Navimages:  "https://images.shengws.com/2122_o_1570840361702.png",
-			Nonavimages:"https://images.shengws.com/2122_o_1570840361702.png",
-			Jumpset:    1,
-			Navaddress: "http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&fxtoken=bdc5659cbd1bd67baa9af215b0d6ae4c&fxorgid=3877&timestamp=1571050598&fxadmin=185&wxref=mp.weixin.qq.com#wechat_redirect",
-			Ctime:      time.Now().Unix(),
-			Status:     1,
-			UserOrgId:  userOrgID,
-		}
-		err = site_service.AddDefaultData(&patientNavigation)
-		fmt.Println(err)
-        fmt.Println(patientNavigation)
-		sgjPatientNavigationtwo := models.SgjPatientNavigation{
-			Navtitle:   "联系我们",
-			Navimages:  "https://images.shengws.com/2138_o_1570840377129.png",
-			Nonavimages:"https://images.shengws.com/2138_o_1570840377129.png",
-			Jumpset:    1,
-			Navaddress: "",
-			Ctime:      time.Now().Unix(),
-			Status:     1,
-			UserOrgId:  userOrgID,
-		}
-		err = site_service.AddDefaultData(&sgjPatientNavigationtwo)
-		fmt.Println(err)
-       fmt.Println(sgjPatientNavigationtwo)
-		sgjPatientNavigationthree := models.SgjPatientNavigation{
-			Navtitle:   "在线客服",
-			Navimages:  "https://images.shengws.com/2079_o_1570842501972.png",
-			Nonavimages:"https://images.shengws.com/2079_o_1570842501972.png",
-			Jumpset:    1,
-			Navaddress: "0755-86526342",
-			Ctime:      time.Now().Unix(),
-			Status:     1,
-			UserOrgId:  userOrgID,
-		}
-		err = site_service.AddDefaultData(&sgjPatientNavigationthree)
-		fmt.Println(err)
-        fmt.Println(sgjPatientNavigationthree)
-
-		navigations, err := site_service.GetDefaultNavigation(userOrgID)
-		fmt.Println(err)
-		if err !=nil{
-			this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"sgjPatientNavigation":sgjPatientNavigation,
-			"navigations":navigations,
-		})
-	}
+	//navigation, err := site_service.GetDefaultNavigation(userOrgID)
+	//fmt.Println("错误是设么",err)
+	//if (len(navigation) == 0) {
+	//	sgjPatientNavigation := models.SgjPatientNavigation{
+	//		Navtitle:   "首页",
+	//		Navimages:  "https://images.shengws.com/2099_o_1570840397245.png",
+	//		Nonavimages:"https://images.shengws.com/2099_o_1570840397245.png",
+	//		Jumpset:    1,
+	//		Navaddress: "",
+	//		Ctime:      time.Now().Unix(),
+	//		Status:     1,
+	//		UserOrgId:  userOrgID,
+	//	}
+	//	err = site_service.AddDefaultData(&sgjPatientNavigation)
+	//	patientNavigation := models.SgjPatientNavigation{
+	//		Navtitle:   "微商城",
+	//		Navimages:  "https://images.shengws.com/2122_o_1570840361702.png",
+	//		Nonavimages:"https://images.shengws.com/2122_o_1570840361702.png",
+	//		Jumpset:    1,
+	//		Navaddress: "http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&fxtoken=bdc5659cbd1bd67baa9af215b0d6ae4c&fxorgid=3877&timestamp=1571050598&fxadmin=185&wxref=mp.weixin.qq.com#wechat_redirect",
+	//		Ctime:      time.Now().Unix(),
+	//		Status:     1,
+	//		UserOrgId:  userOrgID,
+	//	}
+	//	err = site_service.AddDefaultData(&patientNavigation)
+	//	fmt.Println(err)
+     //   fmt.Println(patientNavigation)
+	//	sgjPatientNavigationtwo := models.SgjPatientNavigation{
+	//		Navtitle:   "联系我们",
+	//		Navimages:  "https://images.shengws.com/2138_o_1570840377129.png",
+	//		Nonavimages:"https://images.shengws.com/2138_o_1570840377129.png",
+	//		Jumpset:    1,
+	//		Navaddress: "",
+	//		Ctime:      time.Now().Unix(),
+	//		Status:     1,
+	//		UserOrgId:  userOrgID,
+	//	}
+	//	err = site_service.AddDefaultData(&sgjPatientNavigationtwo)
+	//	fmt.Println(err)
+     //  fmt.Println(sgjPatientNavigationtwo)
+	//	sgjPatientNavigationthree := models.SgjPatientNavigation{
+	//		Navtitle:   "在线客服",
+	//		Navimages:  "https://images.shengws.com/2079_o_1570842501972.png",
+	//		Nonavimages:"https://images.shengws.com/2079_o_1570842501972.png",
+	//		Jumpset:    1,
+	//		Navaddress: "0755-86526342",
+	//		Ctime:      time.Now().Unix(),
+	//		Status:     1,
+	//		UserOrgId:  userOrgID,
+	//	}
+	//	err = site_service.AddDefaultData(&sgjPatientNavigationthree)
+	//	fmt.Println(err)
+     //   fmt.Println(sgjPatientNavigationthree)
+	//
+	//	navigations, err := site_service.GetDefaultNavigation(userOrgID)
+	//	fmt.Println(err)
+	//	if err !=nil{
+	//		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"sgjPatientNavigation":sgjPatientNavigation,
+	//		"navigations":navigations,
+	//	})
+	//}
 
 	navigations, err := site_service.GetDefaultNavigation(userOrgID)
 	if err !=nil{
@@ -5601,6 +5699,103 @@ func (this *Microwebsite) UpdatedRolinkAddress()  {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
 		return
 	}
-	id := int64(dataBody["id"].(float64))
+	//id := int64(dataBody["id"].(float64))
+	id,_ := this.GetInt64("id")
+	fmt.Println("id是什么",id)
+	defineaddress :=dataBody["defineaddress"].(string)
+	fmt.Println("defineaddress",defineaddress)
+	conlinkaddress := models.SgjPatientConlinkaddress{
+		Defineaddress: defineaddress,
+	}
+	err = site_service.UpdatedConlinkAddress(id, userOrgID, conlinkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conlinkaddress":conlinkaddress,
+	})
+}
+
+func (this *Microwebsite) UpdatedConrotation(){
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是什么",id)
+	images := dataBody["images"].(string)
+	fmt.Println("images是什么",images)
+	sort := int64(dataBody["sort"].(float64))
+	fmt.Println("sort",sort)
+	piclink := int64(dataBody["piclink"].(float64))
+	fmt.Println("piclink",piclink)
+	linkaddress := dataBody["linkaddress"].(string)
+	fmt.Println("linkaddress",linkaddress)
+	conrotation := models.SgjPatientConrotation{
+		Images:      images,
+		Sort:        sort,
+		Piclink:     piclink,
+		Linkaddress: linkaddress,
+	}
+	err = site_service.UpdatedConrotation(id, userOrgID, conrotation)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conrotation":conrotation,
+	})
+}
+
+func (this *Microwebsite) GetRotationVisibleByLinkId()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	id, _ := this.GetInt64("id")
 	fmt.Println("id是什么",id)
+	conlinkaddress, err := site_service.GetRotationVisibleByLinkId(id, userOrgID)
+	fmt.Println("错误",err)
+	fmt.Println("conlinkaddress",conlinkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"conlinkaddress":conlinkaddress,
+	})
+}
+
+func (this *Microwebsite)  AddRotationVisibleForm(){
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id",userOrgID)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是设么",id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	defineaddress := dataBody["defineaddress"].(string)
+	fmt.Println("defineaddrss",defineaddress)
+	linkaddress := models.SgjPatientLinkaddress{
+		Defineaddress: defineaddress,
+	}
+	err = site_service.UpdatedRotationVisble(id, userOrgID, linkaddress)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"linkaddress":linkaddress,
+	})
 }

models/site_models.go

@@ -38,12 +38,24 @@ type SgjPatientModel struct {
 	Editmargin  []SgjPatientEditmargin `gorm:"ForeignKey:Modeid"`
 	Enviroimages  []SgjPatientEnviroimages `gorm:"ForeignKey:Modeid"`
 	PatientEditpiclink  []SgjPatientEditpiclink `gorm:"ForeignKey:Modeid"`
+}
+func (SgjPatientModel) TableName() string{
+	return "sgj_patient_model"
+}
 
 
-
-
+type PatientModel struct {
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
+	Title string `gorm:"column:title" json:"title" form:"title"`
+	Sort int64 `gorm:"column:sort" json:"sort" form:"sort"`
+	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"`
+	ModeType int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
 }
-func (SgjPatientModel) TableName() string{
+
+func (PatientModel) TableName() string{
 	return "sgj_patient_model"
 }
 
@@ -229,6 +241,7 @@ type SgjPatientNavigation struct {
 	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Linkid int64 `gorm:"column:linkid" json:"linkid" form:"linkid"`
 	Nonavimages string `gorm:"column:nonavimages" json:"nonavimages" form:"nonavimages"`
+	Linktype int64 `gorm:"column:linktype" json:"linktype" form:"linktype"`
 }
 
 func (SgjPatientNavigation) TableName() string  {

service/article_service/article_category_service.go

@@ -311,7 +311,7 @@ func AddComment(comment *models.Comment)(error)  {
 }
 
 func GetReplyAllComents(orgid int64,page int64,limit int64)(comment []*models.Comment,total int64,err error)  {
-	db := service.PatientReadDB().Table("sgj_patient_articles_comment as a").Where("a.status = ?,a.user_org_id = ?",1,orgid)
+	db := service.PatientReadDB().Table("sgj_patient_articles_comment as a").Where("a.status = ? AND a.user_org_id = ?",1,orgid)
 	offset := (page - 1) * limit
 	err = db.Where("parent_id = ?",0).Count(&total).Order("a.ctime desc").Offset(offset).Limit(limit).
 		Select("a.id,a.article_id,a.comment_user_id,a.parent_id,a.content,a.ctime,a.status,a.star_num,a.comment_num,a.comment_id,a.comment_user_name,a.comment_user_avater,a.source,a.ttid,a.tuser_id,a.taid,a.tpid,a.tcid").Find(&comment).Error

service/micro_service/micro_service.go

@@ -146,4 +146,10 @@ func GetRotationLinkAddress(orgid int64,linkid int64)(models.SgjPatientLinkaddre
 	linkaddress := models.SgjPatientLinkaddress{}
 	err := service.PatientReadDB().Model(&linkaddress).Where("user_org_id = ? AND id = ? AND status = ?", orgid, linkid, 1).Find(&linkaddress).Error
 	return linkaddress,err
+}
+
+func GetNavigationLinkAddressById(id int64,orgid int64)(models.SgjPatientEditmargin,error)  {
+	editmargin := models.SgjPatientEditmargin{}
+	err := service.PatientReadDB().Model(&editmargin).Where("id=? and user_org_id = ?", id, orgid).Find(&editmargin).Error
+	return editmargin,err
 }

service/site_service/site_microwebsite_service.go

@@ -261,6 +261,11 @@ func DeleteConrotation(mid int64,orgID int64)(error)  {
 	return err
 }
 
+func DeletePatentEditMargin(mid int64,orgID int64)(error)  {
+	err := service.PatientWriteDB().Model(models.SgjPatientEditmargin{}).Where("modeid = ? AND user_org_id = ?", mid, orgID).Update(map[string]interface{}{"status": 0, "img_show": 0, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
 
 func UpdateOffices(id int64,orgID int64,offices models.SgjPatientOffices) error {
 	err := service.PatientWriteDB().Model(offices).Where("id = ? AND user_org_id = ? AND status = ?", id, orgID, 1).Update(map[string]interface{}{"title": offices.Title, "sort": offices.Sort, "introduction": offices.Introduction, "mtime": time.Now().Unix()}).Error
@@ -285,6 +290,15 @@ func GetData(orgid int64)(model []*models.SgjPatientModel,err error)  {
 		return
 }
 
+func GetPatientNavigation(orgid int64)(navigation []*models.SgjPatientNavigation,err error)  {
+	err = service.PatientReadDB().Where("user_org_id = ? AND status = ?", orgid,1).Find(&navigation).Error
+	return navigation,err
+}
+
+func AddNavgation(navigation *models.SgjPatientNavigation) error  {
+	err := service.PatientReadDB().Create(&navigation).Error
+	return err
+}
 
 
 func UpdateDoctorsInfo(orgID int64,ids[] int64,editdoctor models.SgjPatientEditdoctor)(err error)  {
@@ -414,7 +428,7 @@ func GetShareInfo(orgid int64)(models.SgjPatientShare,error)  {
 }
 
 func DeleteNavitionById(orgID int64,id int64)(error)  {
-	err := service.PatientWriteDB().Model(models.PatientNavgationlink{}).Where("user_org_id = ? AND id = ?", orgID, id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(models.SgjPatientNavigation{}).Where("user_org_id = ? AND id = ?", orgID, id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return  err
 }
 
@@ -571,7 +585,7 @@ func EditNavigation(orgid int64,id int64)(models.SgjPatientNavigation,error){
 }
 
 func UpdateNavtion(id int64,orgid int64,navigation models.SgjPatientNavigation) error {
-	err := service.PatientWriteDB().Model(navigation).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"navtitle": navigation.Navtitle, "navimages": navigation.Navimages,"nonavimages":navigation.Nonavimages, "jumpset": navigation.Jumpset, "navaddress": navigation.Navaddress, "mtime": time.Now().Unix()}).Error
+	err := service.PatientWriteDB().Model(navigation).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Update(map[string]interface{}{"navtitle": navigation.Navtitle, "navimages": navigation.Navimages,"nonavimages":navigation.Nonavimages, "jumpset": navigation.Jumpset, "navaddress": navigation.Navaddress,"linkid":navigation.Linkid,"linktype":navigation.Linktype, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -868,10 +882,10 @@ func AddLinkAddress(linkaddress *models.SgjPatientLinkaddress)  error {
 	return err
 }
 
-func GetLinkAddress(orgid int64)(models.SgjPatientLinkaddress,error)  {
+func GetLinkAddress(orgid int64,id int64)(models.SgjPatientLinkaddress,error)  {
 
 	linkaddress := models.SgjPatientLinkaddress{}
-	err := service.PatientReadDB().Model(&linkaddress).Where("user_org_id = ? AND status = ? ", orgid, 1).Last(&linkaddress).Error
+	err := service.PatientReadDB().Model(&linkaddress).Where("user_org_id = ? AND id = ? AND status = ? ", orgid,id, 1).Find(&linkaddress).Error
 	return linkaddress,err
 }
 
@@ -941,9 +955,9 @@ func GetConLinkAddressById(orgid int64)(models.SgjPatientConlinkaddress,error)
 	return conlinkaddress,err
 }
 
-func GetLinkAddressDetail(orgid int64,conid int64)(models.SgjPatientConlinkaddress,error)  {
+func GetLinkAddressDetail(orgid int64,id int64)(models.SgjPatientConlinkaddress,error)  {
 	conlinkaddress := models.SgjPatientConlinkaddress{}
-	err := service.PatientReadDB().Where("user_org_id = ? AND con_id = ? AND status = ?", orgid, conid, 1).Find(&conlinkaddress).Error
+	err := service.PatientReadDB().Where("user_org_id = ? AND id = ? AND status = ?", orgid, id, 1).Find(&conlinkaddress).Error
 	return conlinkaddress,err
 }
 
@@ -969,6 +983,12 @@ func AddMagiclinkData(magiclink *models.SgjPatientMagiclink)error  {
 	return err
 }
 
+func GetPatienModelByModelId(id int64,orgid int64)(models.PatientModel,error)  {
+	model := models.PatientModel{}
+	err := service.PatientReadDB().Model(&model).Where("id=? AND user_org_id = ?", id, orgid).Find(&model).Error
+	return model,err
+}
+
 func GetMacLinkAddressTwo (orgid int64)(patientMagiclink []models.SgjPatientMagiclink,err error) {
 	err = service.PatientReadDB().Model(&patientMagiclink).Where("user_org_id = ? AND status = ?", orgid, 1).Find(&patientMagiclink).Error
 	return patientMagiclink,err
@@ -1105,6 +1125,28 @@ func GetNavgationlinkAddressBylinkId(orgid int64,linkid int64)(models.PatientNav
 	return navgationlink,err
 }
 
+func GetNavgationLinkById(id int64,orgid int64)(*models.PatientNavgationlink,error)  {
+	 var pat  models.PatientNavgationlink
+	 var err error
+	 err = service.PatientReadDB().Model(&models.PatientNavgationlink{}).Where(" id = ? AND user_org_id = ?", id, orgid).Find(&pat).Error
+
+	if err == gorm.ErrRecordNotFound{
+		return nil,err
+
+	}
+	if err != nil {
+		return nil, err
+	}
+   return &pat,nil
+
+}
+
+func AddNavigationlink(navgationlink *models.PatientNavgationlink) error {
+
+	err := service.PatientWriteDB().Create(&navgationlink).Error
+	return err
+}
+
 func UpdateditnavigationLink(id int64,orgid int64,navgationlink models.PatientNavgationlink) error {
 
 	err := service.PatientWriteDB().Model(&navgationlink).Where("id = ? AND user_org_id =?", id, orgid).Update(map[string]interface{}{"linktype": navgationlink.Linktype, "navitionlinktype": navgationlink.Navitionlinktype,  "phone": navgationlink.Phone, "outstationlink":
@@ -1233,4 +1275,28 @@ func GetOutRotationLink(orgid int64,linkid int64)(models.SgjPatientConlinkaddres
 	conlinkaddress := models.SgjPatientConlinkaddress{}
 	err := service.PatientReadDB().Where("user_org_id = ? AND id = ?", orgid, linkid).Find(&conlinkaddress).Error
 	return  conlinkaddress,err
-}
+}
+
+func UpdatedConlinkAddress(id int64,orgid int64,conlinkaddress models.SgjPatientConlinkaddress) error {
+
+	err := service.PatientReadDB().Model(&conlinkaddress).Where("id=? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"defineaddress": conlinkaddress.Defineaddress, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func UpdatedConrotation(id int64,orgid int64,conrotation models.SgjPatientConrotation) error {
+	err := service.PatientReadDB().Model(&conrotation).Where("id=? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"images": conrotation.Images, "sort": conrotation.Sort, "piclink": conrotation.Piclink, "linkaddress": conrotation.Linkaddress, "mtime": time.Now().Unix()}).Error
+	return  err
+}
+
+func GetRotationVisibleByLinkId(id int64,orgid int64)(models.SgjPatientLinkaddress,error)   {
+	conlinkaddress := models.SgjPatientLinkaddress{}
+	err := service.PatientReadDB().Where("id = ? AND user_org_id = ?", id, orgid).Find(&conlinkaddress).Error
+	return  conlinkaddress,err
+}
+
+func UpdatedRotationVisble(id int64,orgid int64,linkaddress models.SgjPatientLinkaddress)error  {
+
+	err := service.PatientReadDB().Model(&linkaddress).Where("id = ? AND user_org_id = ?", id, orgid).Update(map[string]interface{}{"defineaddress": linkaddress.Defineaddress, "mtime": time.Now().Unix()}).Error
+	return err
+}
+