From 838c3abb88fa8bf89c690b1a05de1c02bb79ee6c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 20:24:31 +0800
Subject: [PATCH] fix alarmLevel to alarmLevel.raw
---
extend/util/util.go | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index e680ee6..d5180d0 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -3,12 +3,9 @@
import (
"bytes"
"encoding/json"
- "errors"
"image"
"io/ioutil"
- "net"
"net/http"
- "os/exec"
"strconv"
"webserver/extend/code"
@@ -136,45 +133,6 @@
return
}
-// 鑾峰彇鏈満缃戝崱IP
-func GetLocalIP(networkName string) (ipv4 string, mask string, err error) {
- interfaces, err := net.Interfaces()
- if err != nil {
- return "", "", err
- }
-
- for _, i := range interfaces {
- byName, err := net.InterfaceByName(i.Name)
- if err != nil {
- return "", "", err
- }
- addresses, err := byName.Addrs()
- for _, v := range addresses {
- if ipnet, ok := v.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
- if ipnet.IP.To4() != nil {
- if byName.Name == networkName {
- maskStr := ipnet.Mask.String()
- mask64, _ := strconv.ParseUint(maskStr, 16, 32)
- return ipnet.IP.String(), IpIntToString(int(mask64)), nil
- }
- }
- }
- }
- }
- return "", "", errors.New("ipv4 not found")
-}
-
-func GetDefaultRoute(networkName string) (route string, err error) {
- cmdStr := fmt.Sprintf("ip route show | grep -P \"^default.*%s\" | awk '{print $3}'", networkName)
- cmd := exec.Command("/bin/sh", "-c", cmdStr)
- b, err := cmd.Output()
- if err != nil {
- return "", err
- }
-
- return string(b), nil
-}
-
func StringIpToInt(ipstring string) int {
ipSegs := strings.Split(ipstring, ".")
var ipInt int = 0
@@ -215,6 +173,14 @@
return float32(f)
}
+func ParseScore64(compareScore float64) float64 {
+ if compareScore < 1 {
+ compareScore = compareScore * 100
+ }
+ f, _ := strconv.ParseFloat(fmt.Sprintf("%2.2f", compareScore), 64)
+ return f
+}
+
// UnCompress uncompress
func UnCompress(in []byte) ([]byte, error) {
out := make([]byte, 10*len(in))
--
Gitblit v1.8.0