修改位mysql

SERVER/Meter_Service/config.yaml

@@ -6,11 +6,11 @@ vber:
   fwdPort: 14002 #数据转发端口
   mode: debug
 mysql:
-  host:
-  port:
-  username:
-  password:
-  name:
+  host: 47.112.30.247
+  port: 23306
+  username: root
+  password: 123456
+  name: vbdsm_meter
   maxIdleConns: 10
   maxOpenConns: 2
   log: true

SERVER/Meter_Service/database/appApi/db.go

@@ -12,7 +12,7 @@ type DbAppApi struct {
 
 func (m *DbAppApi) GetList() ([]interface{}, error) {
 	array := make([]interface{}, 0)
-	arr, ok := m.Db.Query("SELECT api.AppId, api.Type, api.Url,app.Host FROM AppInfo AS app LEFT JOIN AppApiInfo AS api ON app.AppId = api.AppId WHERE app.IsDelete = 0 AND api.AppId IS NOT NULL")
+	arr, ok := m.Db.Query("SELECT api.app_id as AppId, api.type as Type, api.url as Url,app.host as Host FROM t_app_info AS app LEFT JOIN t_app_api_info AS api ON app.app_id = api.app_id WHERE app.is_delete = 0 AND api.app_id IS NOT NULL")
 	if ok && arr != nil && len(arr) > 0 {
 		for _, v := range arr {
 			appId, _ := strconv.Atoi(v["AppId"])
@@ -31,20 +31,20 @@ func (m *DbAppApi) GetList() ([]interface{}, error) {
 func (m *DbAppApi) AddOrUpdate(v interface{}) error {
 	d := v.(*App)
 	if d.AppId == 0 {
-		if _, err := m.Db.Exec("INSERT INTO AppInfo(appSecret,appName, host,isDelete) VALUES(?,?,?,?)", d.AppSecret, d.AppName, d.Host, 0); err != nil {
+		if _, err := m.Db.Exec("INSERT INTO t_app_info(app_secret,app_name, host,isDelete) VALUES(?,?,?,?)", d.AppSecret, d.AppName, d.Host, 0); err != nil {
 			return err
 		}
 	} else {
-		if _, err := m.Db.Exec("UPDATE AppInfo SET appSecret=?,appName=?,host=?,isDelete=? WHERE AppId=?", d.AppSecret, d.AppName, d.Host, d.GetDelete(), d.AppId); err != nil {
+		if _, err := m.Db.Exec("UPDATE t_app_info SET app_secret=?,app_name=?,host=?,isDelete=? WHERE app_id=?", d.AppSecret, d.AppName, d.Host, d.GetDelete(), d.AppId); err != nil {
 			return err
 		}
-		if _, err := m.Db.Exec("DELETE FROM AppApiInfo WHERE appId=?", d.AppId); err != nil {
+		if _, err := m.Db.Exec("DELETE FROM t_app_api_info WHERE app_id=?", d.AppId); err != nil {
 			return err
 		}
 	}
 	if len(d.Apis) > 0 {
 		for _, v := range d.Apis {
-			_, err := m.Db.Exec("INSERT INTO AppApiInfo(appId, url, type) VALUES(?,?,?)", d.AppId, v.Url, v.Type)
+			_, err := m.Db.Exec("INSERT INTO t_app_api_info(app_id, url, type) VALUES(?,?,?)", d.AppId, v.Url, v.Type)
 			if err != nil {
 				return err
 			}
@@ -55,7 +55,7 @@ func (m *DbAppApi) AddOrUpdate(v interface{}) error {
 
 func (m *DbAppApi) Delete(v interface{}) error {
 	d := v.(*App)
-	_, err := m.Db.Exec("UPDATE AppInfo SET isDelete=? WHERE AppId=?", 1, d.AppId)
+	_, err := m.Db.Exec("UPDATE t_app_info SET is_delete=? WHERE app_id=?", 1, d.AppId)
 	return err
 }
 
@@ -64,7 +64,7 @@ func (m *DbAppApi) CheckSecret(d *App) bool {
 		return true
 	}
 	appId := d.AppId
-	if arr, ok := m.Db.Query("SELECT AppId, AppSecret FROM AppInfo  WHERE  appId=? AND IsDelete = 0", appId); !ok {
+	if arr, ok := m.Db.Query("SELECT app_id, app_secret as AppSecret FROM t_app_info  WHERE  app_id=? AND is_delete = 0", appId); !ok {
 		return false
 	} else {
 		if len(arr) != 1 {

SERVER/Meter_Service/database/meterCalcParam/db.go

@@ -16,7 +16,9 @@ type DbMeterCalcParam struct {
 
 func (m *DbMeterCalcParam) GetList() ([]interface{}, error) {
 	array := make([]interface{}, 0)
-	rows, err := m.Db.DB.Query("SELECT mcp.Id, mcp.Time, mcp.SumPower, mcp.MaxPower, mcp.Count, mcp.Tps, mcp.Tqs, mcp.Fps, mcp.Fqs, mcp.Tpe, mcp.Tqe, mcp.Fpe, mcp.Fqe FROM MeterCalcParam AS mcp")
+	rows, err := m.Db.DB.Query("SELECT mcp.id as Id, mcp.time as Time, mcp.sum_power as SumPower" +
+		", mcp.max_power as MaxPower, mcp.count as Count, mcp.tps as Tps, mcp.tqs as Tqs, mcp.fps as Fps, mcp.fqs as Fqs, mcp.tpe as Tpe, mcp.tqe as Tqe" +
+		", mcp.fpe as Fpe, mcp.fqe as Fqe FROM t_meter_calc_param AS mcp")
 	defer func(rows *sql.Rows) {
 		_ = rows.Close()
 	}(rows)
@@ -37,12 +39,12 @@ func (m *DbMeterCalcParam) GetList() ([]interface{}, error) {
 
 func (m *DbMeterCalcParam) AddOrUpdate(v interface{}) error {
 	d := v.(*MeterCalcParam)
-	ret, ok := m.Db.Query("SELECT id FROM MeterCalcParam WHERE id=?", d.Id)
+	ret, ok := m.Db.Query("SELECT id FROM t_meter_calc_param WHERE id=?", d.Id)
 	if ok || len(ret) > 0 {
-		_, err := m.Db.Exec("UPDATE MeterCalcParam SET Time=?, SumPower=?, MaxPower=?, Count=?, Tps=?, Tqs=?, Fps=?, Fqs=?, Tpe=?, Tqe=?, Fpe=?, Fqe=? WHERE Id=?", d.Time, d.SumPower, d.MaxPower, d.Count, d.Tps, d.Tqs, d.Fps, d.Fqs, d.Tpe, d.Tqe, d.Fpe, d.Fqe, d.Id)
+		_, err := m.Db.Exec("UPDATE t_meter_calc_param SET Time=?, sum_power=?, max_power=?, count=?, tps=?, tqs=?, fps=?, fqs=?, tpe=?, tqe=?, fpe=?, fqe=? WHERE Id=?", d.Time, d.SumPower, d.MaxPower, d.Count, d.Tps, d.Tqs, d.Fps, d.Fqs, d.Tpe, d.Tqe, d.Fpe, d.Fqe, d.Id)
 		return err
 	} else {
-		_, err := m.Db.Exec("INSERT INTO MeterCalcParam(Id, Time, SumPower, MaxPower, Count, Tps, Tqs, Fps, Fqs, Tpe, Tqe, Fpe, Fqe) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)", d.Id, d.Time, d.SumPower, d.MaxPower, d.Count, d.Tps, d.Tqs, d.Fps, d.Fqs, d.Tpe, d.Tqe, d.Fpe, d.Fqe)
+		_, err := m.Db.Exec("INSERT INTO t_meter_calc_param(id, time, sum_power, max_power, count, tps, tqs, fps, fqs, tpe, tqe, fpe, fqe) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)", d.Id, d.Time, d.SumPower, d.MaxPower, d.Count, d.Tps, d.Tqs, d.Fps, d.Fqs, d.Tpe, d.Tqe, d.Fpe, d.Fqe)
 		return err
 	}
 }

SERVER/Meter_Service/main.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	_ "MeterService/core/config" // 加载配置文件，需要放在第一行
-	"MeterService/core/logger"   // 加载logger,放第二行
+	"MeterService/core/db/mysql"
+	"MeterService/core/logger" // 加载logger,放第二行
+	"MeterService/service/downStreamService"
 
 	"MeterService/core/db"
-	"MeterService/core/db/sqlite"
+	//"MeterService/core/db/sqlite"
 
 	"MeterService/data"
 	"MeterService/meter/proto"
-	"MeterService/service/downStreamService"
 	"MeterService/service/webService"
 	"os"
 	"os/signal"
@@ -24,7 +25,8 @@ func main() {
 	//defer db.CloseDb(DB)
 
 	// 连接sqlite
-	db.OpenDb(sqlite.OpenSQLite)
+	//db.OpenDb(sqlite.OpenSQLite)
+	db.OpenDb(mysql.OpenMySql)
 	defer db.CloseDb()
 
 	// redis

SERVER/Meter_Service/service/webService/middel/middel.go → SERVER/Meter_Service/service/webService/middleware/middleware.go

@@ -1,4 +1,4 @@
-package middel
+package middleware
 
 import (
 	"MeterService/database/appApi"

SERVER/Meter_Service/service/webService/router/router.go

@@ -2,7 +2,7 @@ package router
 
 import (
 	"MeterService/controller"
-	"MeterService/service/webService/middel"
+	"MeterService/service/webService/middleware"
 
 	"github.com/gin-gonic/gin"
 )
@@ -18,7 +18,7 @@ func Load(g *gin.Engine) *gin.Engine {
 	app := g.Group("/App")
 	app.POST("/Register", controller.RegisterApp)
 
-	device := g.Group("/Device").Use(middel.UseCheckApp())
+	device := g.Group("/Device").Use(middleware.UseCheckApp())
 	device.POST("/Add", controller.AddDevice)
 	device.POST("/Update", controller.UpdateDevice)
 	device.POST("/Delete", controller.DeleteDevice)