tijiao

entity/resources.go

@@ -0,0 +1,32 @@
+package entity
+
+type ResourcesAuth struct {
+	Id          int64 `xorm:"pk autoincr id" form:"id" json:"id"`
+	EmployeeId  int64 `xorm:"employeeId" form:"employeeId" json:"employeeId"`    //用户标识
+	ResourcesId int64 `xorm:"resourcesId" form:"resourcesId" json:"resourcesId"` //资源标识
+	Quota       int64 `xorm:"quota" form:"quota" json:"quota"`                   //定额
+	Ratio       int64 `xorm:"ratio" form:"ratio" json:"ratio"`                   //比例
+	State       int64 `xorm:"state" form:"state" json:"state"`                   //状态
+}
+
+type AccountBalance struct {
+	Id         int64  `xorm:"pk autoincr id" form:"id" json:"id"`
+	EmployeeId int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"` //人员标识
+	Name       string `xorm:"name" form:"name" json:"name"`                   //资源名称
+	Number     int64  `xorm:"number" form:"number" json:"number"`             //余额
+	Code       string `xorm:"code" form:"code" json:"code"`                   //资源代码
+	Spec       string `xorm:"spec" form:"spec" json:"spec"`                   //规格
+}
+
+type ConsumeRecord struct {
+	Id            int64  `xorm:"pk autoincr id" form:"id" json:"id"`
+	EmployeeId    int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"`       //人员标识; //用户标识
+	CompanyId     int64  `xorm:"companyId" form:"companyId" json:"companyId"`          //用户标识
+	ResourceType  string `xorm:"resourceType" form:"resourceType" json:"resourceType"` //资源类型
+	ExportNum     int64  `xorm:"exportNum" form:"exportNum" json:"exportNum"`//导出数量
+	DeductionType int64  `xorm:"deductionType" form:"deductionType" json:"deductionType"` //扣费类型(1高级字段包)
+	RuleId        int64  `xorm:"ruleId" form:"ruleId" json:"ruleId"`
+	ExportTime    string `xorm:"exportTime" form:"exportTime" json:"exportTime"`
+	UserType      int64  `xorm:"userType" form:"userType" json:"userType"`
+	DepartmentId  int64  `xorm:"departmentId" form:"departmentId" json:"departmentId"`
+}

rpc/internal/logic/findaccountbalancelogic.go

@@ -0,0 +1,41 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type FindAccountBalanceLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewFindAccountBalanceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindAccountBalanceLogic {
+	return &FindAccountBalanceLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *FindAccountBalanceLogic) FindAccountBalance(in *resourcesCenter.AccountBalanceReq) (*resourcesCenter.AccountBalanceRes, error) {
+	// todo: add your logic here and delete this line
+	dataList, err := resourceManageService.FindAccountBalance(in)
+	if len(dataList) == 0 && err != nil {
+		return &resourcesCenter.AccountBalanceRes{
+			Code:    0,
+			Message: "查询出错",
+			Data:    dataList,
+		}, err
+	}
+	return &resourcesCenter.AccountBalanceRes{
+		Code:    1,
+		Message: "查询成功",
+		Data:    dataList,
+	}, nil
+}

rpc/internal/logic/findcompanyorganlogic.go

@@ -1,33 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
-	"app.yhyue.com/moapp/jyResourcesCenter/service"
-	"context"
-
-	"github.com/tal-tech/go-zero/core/logx"
-)
-
-type FindCompanyOrganLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewFindCompanyOrganLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindCompanyOrganLogic {
-	return &FindCompanyOrganLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-var companyCenterService service.CompanyCenterService
-
-// 查询用户组织信息
-func (l *FindCompanyOrganLogic) FindCompanyOrgan(in *resourcesCenter.OrganRequest) (*resourcesCenter.CompanyOrganResponse, error) {
-	// todo: add your logic here and delete this line
-	code, msg, data := companyCenterService.CompanyOrgan(in)
-	return &resourcesCenter.CompanyOrganResponse{Code: code, Message: msg, Data: data}, nil
-}

rpc/internal/logic/findconsumerecordlogic.go

@@ -0,0 +1,41 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type FindConsumeRecordLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewFindConsumeRecordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindConsumeRecordLogic {
+	return &FindConsumeRecordLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *FindConsumeRecordLogic) FindConsumeRecord(in *resourcesCenter.ConsumeRecordReq) (*resourcesCenter.ConsumeRecordRes, error) {
+	// todo: add your logic here and delete this line
+	recordArr, err := resourceManageService.FindConsumeRecord(in)
+	if len(recordArr) == 0 && err != nil {
+		return &resourcesCenter.ConsumeRecordRes{
+			Code:    0,
+			Message: "查询出错",
+			Data:    recordArr,
+		}, err
+	}
+	return &resourcesCenter.ConsumeRecordRes{
+		Code:    1,
+		Message: "查询成功",
+		Data:    recordArr,
+	}, nil
+}

rpc/internal/logic/findresourcesauthlogic.go

@@ -0,0 +1,44 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/jyResourcesCenter/service"
+	"context"
+
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+var resourceManageService = service.ResourceManageService{}
+
+type FindResourcesAuthLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewFindResourcesAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindResourcesAuthLogic {
+	return &FindResourcesAuthLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *FindResourcesAuthLogic) FindResourcesAuth(in *resourcesCenter.ResourcesAuthReq) (*resourcesCenter.ResourcesAuthRes, error) {
+	// todo: add your logic here and delete this line
+	authArr, err := resourceManageService.FindResourcesAuth(in)
+	if len(authArr) == 0 && err != nil {
+		return &resourcesCenter.ResourcesAuthRes{
+			Code:    0,
+			Message: "查询出错",
+			Data:    authArr,
+		}, err
+	}
+	return &resourcesCenter.ResourcesAuthRes{
+		Code:    0,
+		Message: "查询成功",
+		Data:    authArr,
+	}, nil
+}

rpc/internal/server/resourcescenterserver.go

@@ -21,10 +21,22 @@ func NewResourcesCenterServer(svcCtx *svc.ServiceContext) *ResourcesCenterServer
 	}
 }
 
-// 查询用户组织信息
-func (s *ResourcesCenterServer) FindCompanyOrgan(ctx context.Context, in *resourcesCenter.OrganRequest) (*resourcesCenter.CompanyOrganResponse, error) {
-	l := logic.NewFindCompanyOrganLogic(ctx, s.svcCtx)
-	return l.FindCompanyOrgan(in)
+// 查询账户资源权限
+func (s *ResourcesCenterServer) FindResourcesAuth(ctx context.Context, in *resourcesCenter.ResourcesAuthReq) (*resourcesCenter.ResourcesAuthRes, error) {
+	l := logic.NewFindResourcesAuthLogic(ctx, s.svcCtx)
+	return l.FindResourcesAuth(in)
+}
+
+// 查询账户资源余额
+func (s *ResourcesCenterServer) FindAccountBalance(ctx context.Context, in *resourcesCenter.AccountBalanceReq) (*resourcesCenter.AccountBalanceRes, error) {
+	l := logic.NewFindAccountBalanceLogic(ctx, s.svcCtx)
+	return l.FindAccountBalance(in)
+}
+
+// 查询流水账
+func (s *ResourcesCenterServer) FindConsumeRecord(ctx context.Context, in *resourcesCenter.ConsumeRecordReq) (*resourcesCenter.ConsumeRecordRes, error) {
+	l := logic.NewFindConsumeRecordLogic(ctx, s.svcCtx)
+	return l.FindConsumeRecord(in)
 }
 
 // 根据账户标识修改资源结存账

rpc/resourcesCenter.proto

@@ -1,50 +1,7 @@
 syntax = "proto3";
 
 package resourcesCenter;
-option go_package="resourcesCenter/";
-
-message OrganRequest{
-   string   name = 1; //组织名称
-   string   shortName = 2;  //组织简称
-   string   contactPerson = 3;  //组织联系人
-   string   contactPhone= 4;//组织联系人手机号
-   int64    parentId=5;//上级部门ID
-   int64    companyId=6;//企业信息ID
-   int64    id = 7;     //组织ID
-}
-message CompanyOrganResponse {
-   int64    code =1;            //响应代码
-   string   message=2;          //响应消息
-   repeated CompanyOrgan data=3;
-}
-message CompanyOrgan {
-   string  name = 1;         //组织名称
-   string  shortName = 2;    //组织简称
-   string  contactPerson = 3;//组织联系人
-   string  contactPhone= 4;  //组织联系人手机号
-   int64   parentId=5;       //上级部门ID
-   int64   companyId=6;      //企业信息ID
-   bool    state = 7;
-   string  createAt = 8;
-   string  updateAt = 9;
-   string  deleteAt = 10;
-   int64   id=11;
- }
- message Organ {
-   string  name = 1;         //组织名称
-   string  shortName = 2;    //组织简称
-   string  contactPerson = 3;//组织联系人
-   string  contactPhone= 4;  //组织联系人手机号
-   int64   parentId=5;       //上级部门ID
-   int64   companyId=6;      //企业信息ID
-   bool    state = 7;
-   string  createAt = 8;
-   string  updateAt = 9;
-   string  deleteAt = 10;
-   int64   id=11;
-   repeated Organ data=12;   //列表
- }
-
+option go_package = "resourcesCenter/";
  message Response {
     int64    code =1;            //响应代码
     string   message=2;          //响应消息
@@ -72,11 +29,85 @@ message CompanyOrgan {
       int64    departmentId =9;      //组织标识
 
    }
+
+message ResourcesAuth {
+    int64 id = 1;
+    int64 employeeId = 2; //用户标识
+    int64 resourcesId = 3; //资源标识
+    int64 quota = 4; //定额
+    int64 ratio = 5; //比例
+    int64 state = 6; //状态
+}
+
+message ResourceBalance {
+    int64 id = 1;
+    int64 employeeId = 2; //人员标识
+    string name = 3; //资源名称
+    int64 number = 4; //剩余数量
+    string code = 5; //资源代码
+    string spec = 6; //规格
+}
+
+message ConsumeRecord {
+    int64 id = 1;
+    int64 employeeId = 2; //用户标识
+    int64 companyId = 3; //用户标识
+    string resourceType = 4;
+    int64 exportNum = 5;
+    int64 deductionType = 6;
+    int64 ruleId = 7;
+    string exportTime = 8;
+    int64 userType = 9;
+    int64 departmentId = 10;
+}
+
+//根据账户标识查询资源权限请求参数
+message ResourcesAuthReq {
+    int64 employeeId = 1;
+}
+
+message ResourcesAuthRes {
+    int64 code = 1; //响应代码
+    string message = 2; //响应消息
+    repeated ResourcesAuth data = 3; //账号拥有的资源权限
+}
+
+//根据账户标识查询账户余额
+message AccountBalanceReq {
+    int64 employeeId = 1; //用户标识
+    int64 companyId = 2; //公司标识
+    int64 departmentId = 3; //部门标识
+}
+
+message AccountBalanceRes {
+    int64 code = 1;
+    string message = 2;
+    repeated ResourceBalance data = 3;
+}
+
+//查询流水账
+message ConsumeRecordReq {
+    int64 employeeId = 1;
+    int64 companyId = 2;
+}
+
+message ConsumeRecordRes {
+    int64 code = 1;
+    string message = 2;
+    repeated ConsumeRecord data = 3;
+}
+
+
 service ResourcesCenter {
-  //查询用户组织信息
-  rpc findCompanyOrgan(OrganRequest) returns(CompanyOrganResponse);
-  //根据账户标识修改资源结存账
-  rpc updateUserBalance(Balance) returns(Response);
-  //根据账户标识记录资源使用流水账
-  rpc updateUserDetailed(Detailed) returns(Response);
+    //查询账户资源权限
+    rpc findResourcesAuth (ResourcesAuthReq) returns (ResourcesAuthRes);
+    //查询账户资源余额
+    rpc findAccountBalance (AccountBalanceReq) returns (AccountBalanceRes);
+    //查询流水账
+    rpc findConsumeRecord (ConsumeRecordReq) returns (ConsumeRecordRes);
+
+     //根据账户标识修改资源结存账
+      rpc updateUserBalance(Balance) returns(Response);
+      //根据账户标识记录资源使用流水账
+      rpc updateUserDetailed(Detailed) returns(Response);
 }

rpc/resourcesCenterclient/resourcescenter.go

@@ -14,17 +14,26 @@ import (
 )
 
 type (
-	CompanyOrgan         = resourcesCenter.CompanyOrgan
-	Organ                = resourcesCenter.Organ
-	Response             = resourcesCenter.Response
-	Balance              = resourcesCenter.Balance
-	Detailed             = resourcesCenter.Detailed
-	OrganRequest         = resourcesCenter.OrganRequest
-	CompanyOrganResponse = resourcesCenter.CompanyOrganResponse
+	Detailed          = resourcesCenter.Detailed
+	ResourcesAuth     = resourcesCenter.ResourcesAuth
+	ResourceBalance   = resourcesCenter.ResourceBalance
+	AccountBalanceReq = resourcesCenter.AccountBalanceReq
+	AccountBalanceRes = resourcesCenter.AccountBalanceRes
+	ConsumeRecordReq  = resourcesCenter.ConsumeRecordReq
+	Response          = resourcesCenter.Response
+	Balance           = resourcesCenter.Balance
+	ConsumeRecord     = resourcesCenter.ConsumeRecord
+	ResourcesAuthReq  = resourcesCenter.ResourcesAuthReq
+	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
+	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
 
 	ResourcesCenter interface {
-		// 查询用户组织信息
-		FindCompanyOrgan(ctx context.Context, in *OrganRequest) (*CompanyOrganResponse, error)
+		// 查询账户资源权限
+		FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq) (*ResourcesAuthRes, error)
+		// 查询账户资源余额
+		FindAccountBalance(ctx context.Context, in *AccountBalanceReq) (*AccountBalanceRes, error)
+		// 查询流水账
+		FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq) (*ConsumeRecordRes, error)
 		// 根据账户标识修改资源结存账
 		UpdateUserBalance(ctx context.Context, in *Balance) (*Response, error)
 		// 根据账户标识记录资源使用流水账
@@ -42,10 +51,22 @@ func NewResourcesCenter(cli zrpc.Client) ResourcesCenter {
 	}
 }
 
-// 查询用户组织信息
-func (m *defaultResourcesCenter) FindCompanyOrgan(ctx context.Context, in *OrganRequest) (*CompanyOrganResponse, error) {
+// 查询账户资源权限
+func (m *defaultResourcesCenter) FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq) (*ResourcesAuthRes, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
-	return client.FindCompanyOrgan(ctx, in)
+	return client.FindResourcesAuth(ctx, in)
+}
+
+// 查询账户资源余额
+func (m *defaultResourcesCenter) FindAccountBalance(ctx context.Context, in *AccountBalanceReq) (*AccountBalanceRes, error) {
+	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
+	return client.FindAccountBalance(ctx, in)
+}
+
+// 查询流水账
+func (m *defaultResourcesCenter) FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq) (*ConsumeRecordRes, error) {
+	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
+	return client.FindConsumeRecord(ctx, in)
 }
 
 // 根据账户标识修改资源结存账

rpc/test/company_test.go

@@ -13,12 +13,13 @@ import (
 	"time"
 )
 
-var configFile = flag.String("f", "usercenter.yaml", "the config file")
+var configFile = flag.String("f", "resourcescenter.yaml", "the config file")
 var c config.Config
 
 func init() {
 	conf.MustLoad(*configFile, &c)
 }
+
 /*EmployeeId
 int64  //人员标识
 CompanyId
@@ -56,6 +57,7 @@ func Test_UpdateUserBalance(t *testing.T) {
 	log.Println("err ", err)
 	log.Println("req ", res)
 }
+
 /*EmployeeId
 int64  //人员标识
 CompanyId

rpc/test/resourcesRecord_test.go

@@ -0,0 +1,28 @@
+package test
+
+import (
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
+	"context"
+	"github.com/tal-tech/go-zero/core/conf"
+	"github.com/tal-tech/go-zero/zrpc"
+	"log"
+	"testing"
+	"time"
+)
+
+/*var configFile = flag.String("f", "resourcescenter.yaml", "the config file")
+var c config.Config
+*/
+func init() {
+	conf.MustLoad(*configFile, &c)
+}
+
+func Test_FindResourcesAuth(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
+	req := &resourcesCenter.ResourcesAuthReq{}
+	req.EmployeeId = 6
+	res, err := FileSystem.FindResourcesAuth(ctx, req)
+	log.Println("结果", res, "报错：", err)
+}

rpc/test/usercenter.yaml → rpc/test/resourcescenter.yaml

@@ -11,9 +11,9 @@ Redis:
   idleTimeOut: 240
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+    - 127.0.0.1:2379
   Key: resourcescenter.rpc
-DataSource: root:root@tcp(127.0.0.1:3306)/jy_user_center?charset=utf8mb4&parseTime=true&loc=Local
+DataSource: root:123456@tcp(127.0.0.1:3306)/jy_user_center?charset=utf8mb4&parseTime=true&loc=Local
 FileSystemConf:
   Etcd:
     Hosts:

service/companyCenterService.go

@@ -1,34 +0,0 @@
-package service
-
-import (
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
-	"log"
-
-	"app.yhyue.com/moapp/jyResourcesCenter/entity"
-)
-
-type CompanyCenterService struct{}
-
-//企业下的组织
-func (service *CompanyCenterService) CompanyOrgan(in *resourcesCenter.OrganRequest) (int64, string, []*resourcesCenter.CompanyOrgan) {
-	orm := entity.Engine
-	organList := []*resourcesCenter.CompanyOrgan{}
-	departmentList := []*entity.Department{}
-	err := orm.Table("department").Select("*").Where("companyId=? and  parentId=? and  state=1", in.CompanyId, in.Id).Find(&departmentList)
-	if err != nil {
-		log.Panicln("企业下的组织查询失败：", err)
-		return entity.ErrorCode, "企业下的组织查询失败", organList
-	}
-	for _, v := range departmentList {
-		organList = append(organList, &resourcesCenter.CompanyOrgan{
-			Id:            v.Id,
-			Name:          v.Name,
-			ShortName:     v.ShortName,
-			ContactPerson: v.ContactPerson,
-			ContactPhone:  v.ContactPhone,
-			CompanyId:     v.CompanyId,
-			ParentId:      v.ParentId,
-		})
-	}
-	return entity.SuccessCode, "企业下的组织查询成功", organList
-}

service/resourceManageService.go

@@ -0,0 +1,70 @@
+package service
+
+import (
+	"app.yhyue.com/moapp/jyResourcesCenter/entity"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
+)
+
+type ResourceManageService struct{}
+
+//查询用户资源权限
+func (service *ResourceManageService) FindResourcesAuth(data *resourcesCenter.ResourcesAuthReq) ([]*resourcesCenter.ResourcesAuth, error) {
+	orm := entity.Engine.NewSession()
+	var authArr []*entity.ResourcesAuth
+	var authList []*resourcesCenter.ResourcesAuth
+	err := orm.Table("resources_authorization").Select("*").Where("employeeId = ?", data.EmployeeId).Find(&authArr)
+	if err != nil {
+		return authList, err
+	}
+	for _, v := range authArr {
+		authList = append(authList,&resourcesCenter.ResourcesAuth{
+			Id:v.Id,
+			EmployeeId:v.EmployeeId,
+			ResourcesId:v.ResourcesId,
+			Quota:v.Quota,
+			State:v.State,
+			Ratio:v.Ratio,
+		})
+	}
+	return authList, nil
+}
+
+//查询账户资源余额
+func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.AccountBalanceReq)([]*resourcesCenter.ResourceBalance,error){
+	orm := entity.Engine.NewSession()
+	var accountBalanceArr []*entity.AccountBalance
+	var dataList []*resourcesCenter.ResourceBalance
+	err := orm.Table("account_resources").Where("employeeId = ?", in.EmployeeId).Find(&accountBalanceArr)
+	if err != nil {
+		return dataList, err
+	}
+	for _, v := range accountBalanceArr {
+		dataList = append(dataList,&resourcesCenter.ResourceBalance{
+			Id:v.Id,
+			EmployeeId:v.EmployeeId,
+			Name:v.Name,
+			Code:v.Code,
+			Number:v.Number,
+			Spec:v.Spec,
+		})
+	}
+	return dataList, nil
+}
+
+//查询账户资源余额
+func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.ConsumeRecordReq)([]*resourcesCenter.ConsumeRecord,error){
+	orm := entity.Engine.NewSession()
+	var recordArr []*entity.ConsumeRecord
+	var dataList []*resourcesCenter.ConsumeRecord
+	err := orm.Table("consume_record").Where("employeeId = ?", in.EmployeeId).Find(&recordArr)
+	if err != nil {
+		return dataList, err
+	}
+	for _, v := range recordArr {
+		dataList = append(dataList,&resourcesCenter.ConsumeRecord{
+			Id:v.Id,
+
+		})
+	}
+	return dataList, nil
+}

util/recursion.go

@@ -1,58 +0,0 @@
-package util
-
-import (
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
-	"bytes"
-	"encoding/binary"
-	"fmt"
-)
-
-func MakeTree(Allnode []*resourcesCenter.Organ, node *resourcesCenter.Organ) { //参数为父节点，添加父节点的子节点指针切片
-	childs, _ := haveChild(Allnode, node) //判断节点是否有子节点并返回
-	if childs != nil {
-		node.Data = append(node.Data, childs[0:]...) //添加子节点
-		for _, v := range childs {                   //查询子节点的子节点，并添加到子节点
-			_, has := haveChild(Allnode, v)
-			if has {
-				MakeTree(Allnode, v) //递归添加节点
-			}
-		}
-	}
-}
-
-//判断是否有子节点
-func haveChild(Allnode []*resourcesCenter.Organ, node *resourcesCenter.Organ) (childs []*resourcesCenter.Organ, yes bool) {
-	for _, v := range Allnode {
-		if v.ParentId == node.Id {
-			childs = append(childs, v)
-		}
-	}
-	if childs != nil {
-		yes = true
-	}
-	return
-}
-
-//字节数(大端)组转成int(有符号)
-func bytesToIntS(b []byte) (int, error) {
-	if len(b) == 3 {
-		b = append([]byte{0}, b...)
-	}
-	bytesBuffer := bytes.NewBuffer(b)
-	switch len(b) {
-	case 1:
-		var tmp int8
-		err := binary.Read(bytesBuffer, binary.BigEndian, &tmp)
-		return int(tmp), err
-	case 2:
-		var tmp int16
-		err := binary.Read(bytesBuffer, binary.BigEndian, &tmp)
-		return int(tmp), err
-	case 4:
-		var tmp int32
-		err := binary.Read(bytesBuffer, binary.BigEndian, &tmp)
-		return int(tmp), err
-	default:
-		return 0, fmt.Errorf("%s", "BytesToInt bytes lenth is invaild!")
-	}
-}