修复 按钮权限 与 供电箱 关联灯杆数

app/device/controller/utilController.go

@@ -103,9 +103,9 @@ func (c *utilCtl) GetModelList(ctx *gin.Context) {
 }
 
 func (c *utilCtl) GetTenantCode(ctx *gin.Context) {
-	//value, _ := ctx.Get(middleware.Authorization)
-	//claims := value.(*middleware.Claims)
-	//code, _ := service.UtilService.GetTenantCode(claims.TenantId)
-	//code.CityCode = ctx.Query("type") + code.CityCode
-	ctx.JSON(http.StatusOK, common.SuccessResponse("", nil))
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	code, _ := service.UtilService.GetTenantCode(claims.TenantId)
+	code.CityCode = ctx.Query("type") + code.CityCode
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, code))
 }

app/device/dao/lampPoleDao.go

@@ -110,3 +110,11 @@ func (c LampPole) Count() int64 {
 		c.GroupId, c.IsDeleted).Count(&count).Error
 	return count
 }
+
+//得到关联灯杆数 2022-12-08 dsx
+func (c LampPole) GetSwitchBoxCount() (int64, error) {
+	var count int64
+	err := Db.Debug().Model(&c).Where("(box_id = ?) and is_deleted = 0",
+		c.BoxId).Count(&count).Error
+	return count, err
+}

app/device/dao/switchBoxDao.go

@@ -32,6 +32,8 @@ type SwitchBox struct {
 	Status         int       `gorm:"type:int" json:"status"`                            //状态 0=正常,1=异常
 	Tag            string    `gorm:"type:varchar(255)" json:"tag"`                      //标签，保留字段(逗号区分)
 	BoxPhotoUrl    string    `gorm:"type:varchar(255)" json:"boxPhotoUrl"`              //供电箱照片地址
+
+	CountLampPole int64 `gorm:"-" json:"countLampPole" comment:"关联灯杆数" default:0`
 }
 
 func (SwitchBox) TableName() string {
@@ -86,7 +88,7 @@ func (c SwitchBox) GetDevices(offset, limit int) ([]SwitchBox, error) {
 	return devices, err
 }
 
-//得到关联设备
+//得到关联设备 2022-12-08 dsx
 func (c SwitchBox) GetDeviceCount() (int64, error) {
 	var count int64
 	err := Db.Debug().Model(&c).Where("(transformer_id = ?) and is_deleted = 0",

app/device/service/switchBoxService.go

@@ -78,6 +78,12 @@ func (s *switchBoxService) List(searchValue string, current, size int) ([]dao.Sw
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
+	//关联灯杆
+	for i, box := range devices {
+		pole := dao.LampPole{}
+		pole.BoxId = box.ID
+		devices[i].CountLampPole, _ = pole.GetSwitchBoxCount()
+	}
 	return devices, nil
 }
 

app/system/controller/menu.go

@@ -4,10 +4,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"iot_manager_service/app/middleware"
 	"iot_manager_service/app/system/dao"
+	"iot_manager_service/app/system/model"
 	"iot_manager_service/app/system/service"
 	"iot_manager_service/util/common"
 	"net/http"
 	"strconv"
+	"strings"
 )
 
 var Menu = new(menu)
@@ -89,8 +91,47 @@ func (c *menu) RoutesExt(cxt *gin.Context) {
 
 }
 
+//由于子菜单 没有分的很详细，这里直接先让他们全部有这个权限 2022-12-07 dsx
 func (c *menu) Buttons(ctx *gin.Context) {
-
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	menus, err := service.MenuService.Routes(claims.RoleId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, common.FailResponse(err.Error(), nil))
+		return
+	}
+	var menus2 []model.MenuRouteDetail
+	subMenus := make(map[string]string)
+	subMenus["add"] = "新增"
+	subMenus["edit"] = "修改"
+	subMenus["view"] = "查看"
+	subMenus["delete"] = "删除"
+	for _, menu := range menus {
+		if menu.Children != nil {
+			for _, child := range menu.Children {
+				var menus3 []model.MenuRouteDetail
+				var i int64
+				i = 1
+				for k, v := range subMenus {
+					var menu4 model.MenuRouteDetail
+					menu4.ID = child.ID + i
+					menu4.ParentId = child.ID
+					child.Path = strings.ReplaceAll(child.Path, "-", "")
+					subPaths := strings.Split(child.Path, "/")
+					subPath := subPaths[len(subPaths)-1]
+					menu4.Code = subPath + "_" + k
+					menu4.Name = v
+					menu4.Path = child.Path + "/" + k
+					menu4.Source = k
+					menus3 = append(menus3, menu4)
+					i++
+				}
+				child.Children = menus3
+				menus2 = append(menus2, child)
+			}
+		}
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, menus2))
 }
 
 func (c *menu) Tree(ctx *gin.Context) {

util/common/errors.go

@@ -22,9 +22,10 @@ const (
 
 func SuccessResponse(msg string, data interface{}) *Errors {
 	return &Errors{
-		Code: CodeSucceed,
-		Msg:  msg,
-		Data: data,
+		Code:    CodeSucceed,
+		Msg:     msg,
+		Data:    data,
+		Success: true,
 	}
 }