机构功能相关接口

conf/app.conf

@@ -43,8 +43,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 [prod]
 httpdomain = http://api.szjkhd.com
-sso_domain = https://sso.kuyicloud.com
-front_end_domain = "https://xt.kuyicloud.com/#"
+
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
@@ -82,8 +81,7 @@ redisdb = 0
 
 [dev]
 httpdomain = http://api.szjkhd.com
-sso_domain = https://testsso.sgjyun.com
-front_end_domain = "http://xt.test.sgjyun.com/#"
+
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/admin_api_controllers/admin_api_router_register.go

@@ -6,13 +6,13 @@ import "github.com/astaxie/beego"
 func AdminAPIControllersRegisterRouters() {
 	beego.Router("/admin/api/login/pwd", &LoginAPIController{}, "post:LoginByPwd")
 
-	beego.Router("/admin/api/org/regist", &AnalysisAPIController{}, "get:RegistOrg")
-	beego.Router("/admin/api/org/active", &AnalysisAPIController{}, "get:ActiveOrg")
-	beego.Router("/admin/api/user/active", &AnalysisAPIController{}, "get:ActiveUser")
-	beego.Router("/admin/api/org/expiring", &AnalysisAPIController{}, "get:ExpiringOrg")
-	beego.Router("/admin/api/dialysis/analysis", &AnalysisAPIController{}, "get:DialysisAnalysis")
-	beego.Router("/admin/api/monitor/analysis", &AnalysisAPIController{}, "get:MonitorAnalysis")
-	beego.Router("/admin/api/patient/analysis", &AnalysisAPIController{}, "get:PatientAnalysis")
+	//beego.Router("/admin/api/org/regist", &AnalysisAPIController{}, "get:RegistOrg")
+	//beego.Router("/admin/api/org/active", &AnalysisAPIController{}, "get:ActiveOrg")
+	//beego.Router("/admin/api/user/active", &AnalysisAPIController{}, "get:ActiveUser")
+	//beego.Router("/admin/api/org/expiring", &AnalysisAPIController{}, "get:ExpiringOrg")
+	//beego.Router("/admin/api/dialysis/analysis", &AnalysisAPIController{}, "get:DialysisAnalysis")
+	//beego.Router("/admin/api/monitor/analysis", &AnalysisAPIController{}, "get:MonitorAnalysis")
+	//beego.Router("/admin/api/patient/analysis", &AnalysisAPIController{}, "get:PatientAnalysis")
 	beego.Router("/admin/api/home/statistics", &AnalysisAPIController{}, "get:HomeStatistics")
 	beego.Router("/admin/api/getdistrictsbyupid", &OrgAPIController{}, "get:GetDistrictsByUpid")
 	beego.Router("/admin/api/org", &OrgAPIController{}, "get:GetOrgList")

controllers/admin_api_controllers/org_api_controller.go

@@ -55,20 +55,16 @@ func (this *OrgAPIController) GetOrgList() {
 		endTime = theTime.Unix()
 	}
 
-	adminInfo := this.GetAdminInfo()
-	if adminInfo.Admin.IsSuperAdmin == 1 {
-		list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit)
-		if err != nil {
+	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit)
+	if err != nil {
 
-		} else {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"list":  list,
-				"total": total,
-			})
-		}
 	} else {
-
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
 	}
+
 }
 
 func (this *OrgAPIController) GetOrgInfo() {

controllers/admin_api_controllers/system_api_controller.go

@@ -7,7 +7,7 @@ import (
 	"XT_Admin_Api/service"
 	"XT_Admin_Api/utils"
 	"encoding/json"
-	"github.com/jinzhu/gorm"
+	"fmt"
 	"reflect"
 	"time"
 )
@@ -111,6 +111,9 @@ func (this *SystemApiController) GetFollowOrg() {
 	FollowOrgs, err := service.FindFollowOrg(id)
 	unFollow, _ := service.FindUnFollowOrgByIds(id)
 
+	fmt.Println(FollowOrgs)
+	fmt.Println(unFollow)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"follows":  FollowOrgs,
@@ -281,15 +284,18 @@ func (this *SystemApiController) PostUnFollow() {
 		OrgId:       org_id,
 		AdminUserId: info.AdminUserId,
 	}
-	service.UpdateFollow(follow)
+	err := service.UpdateFollow(follow)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	}
+
 }
 
 func (this *SystemApiController) ModifyFollowInfo() {
-	org_id, _ := this.GetInt64("org_id")
 	time := time.Now().Unix()
-
 	var orgFollow []*models.OrgFollow
-
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -309,33 +315,55 @@ func (this *SystemApiController) ModifyFollowInfo() {
 					return
 				}
 				admin_user_id := int64(items["admin_user_id"].(float64))
-				follow := &models.OrgFollow{
-					Mtime:       time,
-					Status:      1,
-					Ctime:       time,
-					OrgId:       org_id,
-					AdminUserId: admin_user_id,
+
+				if items["org_id"] == nil || reflect.TypeOf(items["org_id"]).String() != "float64" {
+					utils.ErrorLog("org_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				org_id := int64(items["org_id"].(float64))
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if id == 0 {
+					follow := &models.OrgFollow{
+						Mtime:       time,
+						Status:      1,
+						Ctime:       time,
+						OrgId:       org_id,
+						AdminUserId: admin_user_id,
+					}
+					orgFollow = append(orgFollow, follow)
 				}
-				orgFollow = append(orgFollow, follow)
 			}
 		}
 	}
 
+	fmt.Println(orgFollow)
+
 	//防止数据冗余，先查出之前被删的数据是否存在，存在则直接改变删除状态，不插入新数据
 	for index, follow := range orgFollow {
 		info, err := service.FindFollowRecordByID(follow)
-		if err == gorm.ErrRecordNotFound { //不存在，过滤掉该数据
+
+		if err == nil { //存在，则修改删除状态
 			orgFollow = append(orgFollow[:index], orgFollow[index+1:]...)
-		} else if err == nil { //存在，则修改删除状态
-			follow := &models.OrgFollow{
-				ID:          info.ID,
-				Mtime:       info.Mtime,
-				Status:      1,
-				Ctime:       info.Ctime,
-				OrgId:       info.OrgId,
-				AdminUserId: info.AdminUserId,
+			if info.Status == 0 {
+				follow := &models.OrgFollow{
+					ID:          info.ID,
+					Mtime:       info.Mtime,
+					Status:      1,
+					Ctime:       info.Ctime,
+					OrgId:       info.OrgId,
+					AdminUserId: info.AdminUserId,
+				}
+				service.UpdateFollow(follow)
 			}
-			service.UpdateFollow(follow)
+
 		}
 	}
 

routers/router.go

@@ -10,7 +10,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9527", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com"},
+		AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9527", "http://xt.test.shengws.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://api.szjkhd.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
@@ -19,7 +19,6 @@ func init() {
 
 	// beego.Router("/", &controllers.MainController{})
 
-
 	admin_api.AdminAPIControllersRegisterRouters()
-    function_api.FunctionAPIControllersRegisterRouters()
+	function_api.FunctionAPIControllersRegisterRouters()
 }

service/admin_service.go

@@ -757,8 +757,13 @@ func FindFollowOrg(admin_id int64) ([]*FollowViewModel, error) {
 	return vms, nil
 }
 
-func FindUnFollowOrgByIds(id int64) (org []*models.Org, err error) {
-	err = readUserDb.Raw("Select id, org_name From  sgj_user_org  Where NOT EXISTS (Select id, org_name FROM sgj_org_follow Where sgj_org_follow.org_id = sgj_user_org.id AND sgj_org_follow.admin_user_id = ? AND sgj_org_follow.status = 1)", id).Scan(&org).Error
+type OrgViewModel struct {
+	Id      int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 机构 ID
+	OrgName string `gorm:"column:org_name" json:"org_name"`
+}
+
+func FindUnFollowOrgByIds(id int64) (orgViewModel []*OrgViewModel, err error) {
+	err = readUserDb.Raw("Select id, org_name From  sgj_user_org  Where NOT EXISTS (Select id, org_name FROM sgj_org_follow Where sgj_org_follow.org_id = sgj_user_org.id AND sgj_org_follow.admin_user_id = ? AND sgj_org_follow.status = 1)", id).Scan(&orgViewModel).Error
 	return
 
 }
@@ -791,8 +796,8 @@ func CreateFollowInfo(Follows []*models.OrgFollow) (err error) {
 
 }
 
-func UpdateFollow(follow *models.OrgFollow) {
-	readUserDb.Model(&models.OrgFollow{}).Save(follow)
+func UpdateFollow(follow *models.OrgFollow) (err error) {
+	err = readUserDb.Model(&models.OrgFollow{}).Save(follow).Error
 	return
 }
 

service/db.go

@@ -96,12 +96,6 @@ func ConnectDB() {
 
 }
 
-//func DisconnectDB() {
-//	if err := readDb.Close(); nil != err {
-//		beego.Error("Disconnect from database failed: " + err.Error())
-//	}
-//}
-
 func XTReadDB() *gorm.DB {
 	return readDb
 }