From b8b5e16eb11ca9f049f87ae08235a10969c128af Mon Sep 17 00:00:00 2001 From: kk <13160659024@163.com> Date: Fri, 15 Feb 2019 19:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/gateway1.db | Bin 0 -> 73728 bytes do_send_data.go | 4 +++- loadconfig.go | 2 +- router.go | 10 +++++++++- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 db/gateway1.db diff --git a/db/gateway1.db b/db/gateway1.db new file mode 100644 index 0000000000000000000000000000000000000000..b26e007276dcaa11cbecd8fe66a0555bba01bce2 GIT binary patch literal 73728 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 S4S@Ak-|$2@05GnQ%>My{9ZEL< literal 0 HcmV?d00001 diff --git a/do_send_data.go b/do_send_data.go index e69527a..f8eae47 100644 --- a/do_send_data.go +++ b/do_send_data.go @@ -92,7 +92,9 @@ func build_data(code int, data []Device) []byte { case "其他": bad++ } - satisfaction_data.SATISFACTION = good / (good + bad) + var data float64 + data = good / (good + bad) + satisfaction_data.SATISFACTION = Round(data, 2) data_buf, _ := json.Marshal(R_data) return data_buf } diff --git a/loadconfig.go b/loadconfig.go index 6e5310d..9d1fbb8 100644 --- a/loadconfig.go +++ b/loadconfig.go @@ -13,7 +13,7 @@ type Traffic struct { } type Satisfaction struct { - SATISFACTION float32 `json:"satisfaction"` + SATISFACTION float64 `json:"satisfaction"` } type Conf struct { diff --git a/router.go b/router.go index 1e0935e..7b2c414 100644 --- a/router.go +++ b/router.go @@ -4,6 +4,7 @@ import ( "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" _ "github.com/mattn/go-sqlite3" + "math" "net/http" "strconv" ) @@ -163,10 +164,17 @@ func renliu_api(c *gin.Context) { } func pj_api(c *gin.Context) { - satisfaction_data.SATISFACTION = good / (good + bad) + var data float64 + data = good / (good + bad) + satisfaction_data.SATISFACTION = Round(data, 2) c.JSON(http.StatusOK, gin.H{"status": http.StatusOK, "data": satisfaction_data}) } +func Round(f float64, n int) float64 { + n10 := math.Pow10(n) + return math.Trunc((f+0.5/n10)*n10) / n10 +} + type Seat_data struct { POSITIONLIST []interface{} `json:"positionList"` HASPERSONLIST []interface{} `json:"hasPersonList"`