修复 风力等级显示问题

app/device/controller/infoBoardController.go

@@ -196,7 +196,7 @@ func (s *infoBoardCtl) CronSyncLedPaying(id int) {
 				service.InfoBoardService.EdgePushLedProgram(led.TenantId, led.Sn, playJson)
 				fmt.Printf("需要更新\n")
 			} else {
-				fmt.Printf("无需更新\n")
+				//fmt.Printf("无需更新\n")
 			}
 		} else {
 			//fmt.Printf("led设备不在线Sn = %v \n", led.Sn)

app/device/controller/ipBroadcastController.go

@@ -172,7 +172,7 @@ func (c *ipBroadcastCtl) CronSyncIpCastPaying(id int) {
 					return
 				}
 			} else {
-				fmt.Printf("无需更新\n")
+				//fmt.Printf("无需更新\n")
 			}
 		}
 	}

app/operation/model/environment.go

@@ -26,11 +26,12 @@ const (
 
 type EnvironmentDetail struct {
 	dao.EnvironmentData
-	CreateDate       time.Time `json:"createDate"` //采集日期
-	Name             string    `json:"name"`
-	Sn               string    `json:"sn"`
-	LampPoleLocation string    `json:"lampPoleLocation"`
-	LampLng          string    `json:"lampLng"`
-	LampLat          string    `json:"lampLat"`
-	TenantId         string    `json:"tenantId"`
+	CreateDate        time.Time `json:"createDate"` //采集日期
+	Name              string    `json:"name"`
+	Sn                string    `json:"sn"`
+	LampPoleLocation  string    `json:"lampPoleLocation"`
+	LampLng           string    `json:"lampLng"`
+	LampLat           string    `json:"lampLat"`
+	TenantId          string    `json:"tenantId"`
+	RealTimeWindSpeed string    `json:"realTimeWindSpeed"`
 }

app/operation/service/environmentService.go

@@ -15,7 +15,7 @@ var EnvironmentService = new(environmentService)
 
 type environmentService struct{}
 
-func (s *environmentService) EnvironmentList(tenantId string, ) ([]model.EnvironmentDetail, *common.Errors) {
+func (s *environmentService) EnvironmentList(tenantId string) ([]model.EnvironmentDetail, *common.Errors) {
 	var result []model.EnvironmentDetail
 	devices := deviceService.OptoSensorService.GetByTenant(tenantId)
 	for _, d := range devices {
@@ -30,6 +30,8 @@ func (s *environmentService) EnvironmentList(tenantId string, ) ([]model.Environ
 			detail.LampPoleLocation = lampPole.InstallLocation
 			detail.LampLat = fmt.Sprintf("%f", lampPole.PoleLat)
 			detail.LampLng = fmt.Sprintf("%f", lampPole.PoleLng)
+
+			detail.RealTimeWindSpeed = common.CalculateSpeed(fmt.Sprintf("%.2f", detail.WindSpeed/100)) //风力等级
 		}
 		result = append(result, detail)
 	}

config/config.go

@@ -65,10 +65,11 @@ type redis struct {
 }
 
 type logger struct {
-	Switch int    `yaml:"switch"`
-	Path   string `yaml:"path"`
-	Name   string `yaml:"name"`
-	Level  string `yaml:"level"`
+	Switch    int    `yaml:"switch"`
+	Path      string `yaml:"path"`
+	Name      string `yaml:"name"`
+	Level     string `yaml:"level"`
+	DbShowLog int    `yaml:"db_show_log"`
 }
 
 type minio struct {

config/config.yaml

@@ -11,6 +11,7 @@ logger:
   path:  "./log"
   level: "info"
   name:  "info"
+  db_show_log: 1
 
 # Database configurations.
 database:

main.go

@@ -20,13 +20,13 @@ import (
 	"iot_manager_service/util/logger"
 	"iot_manager_service/util/minio"
 	"net/url"
-	"os"
 	"time"
 )
 
 func main() {
+	cfg := config.Instance()
 	// 只在本地开调试模式
-	if isDevEnv() {
+	if cfg.Logger.DbShowLog == 1 {
 		gin.SetMode(gin.DebugMode)
 	} else {
 		gin.SetMode(gin.ReleaseMode)
@@ -43,7 +43,7 @@ func main() {
 	engine := gin.Default()
 
 	router.InitRouter(engine)
-	if isDevEnv() {
+	if cfg.Logger.DbShowLog == 1 {
 		println(gin.DebugMode + "当前为开发环境，会产生较多调试日志")
 	} else {
 		println(gin.ReleaseMode)
@@ -55,15 +55,18 @@ func main() {
 func initDB() {
 	cfg := config.Instance()
 	dsn := cfg.Database.User + ":" + cfg.Database.Password + "@tcp(" + cfg.Database.Host + ":" + cfg.Database.Port + ")/" + cfg.Database.Name + "?charset=utf8&parseTime=True" + "&loc=" + url.QueryEscape(cfg.Database.Timezone)
-	logCfg := gormLogger.New(logger.Logger, gormLogger.Config{
-		SlowThreshold: 200 * time.Millisecond,
-		LogLevel:      gormLogger.Info,
-		Colorful:      true,
-	})
 	// 如果是本地开发环境 则 打印gorm 查询日志到控制台
-	if isDevEnv() {
+	logCfg := gormLogger.Interface(nil)
+	if cfg.Logger.DbShowLog == 1 {
 		logCfg = gormLogger.Default
+	} else {
+		logCfg = gormLogger.New(logger.Logger, gormLogger.Config{
+			SlowThreshold: 200 * time.Millisecond,
+			LogLevel:      gormLogger.Error,
+			Colorful:      true,
+		})
 	}
+
 	//logCfg = gormLogger.Default
 
 	db, err := gorm.Open(mysql.New(mysql.Config{
@@ -92,15 +95,3 @@ func initDB() {
 	operation.InitDB(db)
 
 }
-
-// isDevEnv 是否开发环境 本地开发需要添加环境变量
-//
-//	[windows] CMD下执行 setx "DEV_ENV" "1"
-//	[linux] export DEV_ENV="1"
-func isDevEnv() bool {
-	//return true
-	if os.Getenv("DEV_ENV") == "1" {
-		return true
-	}
-	return false
-}