轨迹代码

conf/app.ini

@@ -48,8 +48,8 @@ Type = mysql
 User = root
 Password = root
 #Host = 8.130.17.8:3306
-Host = 192.168.1.93:3326
-#Host = 127.0.0.1:3316
+#Host = 192.168.1.93:3326
+Host = 127.0.0.1:3316
 #Name = haiyuan
 #Password = root
 #Password = root
@@ -58,13 +58,13 @@ Host = 192.168.1.93:3326
 #Password = root123456
 #Password = keep
 
-#Password = kptzhu@163.com
+
 #Password = kpt123456*
 #Password = kepaiteng!QAZ
 #Host = 47.92.52.73:3306
 #Host = 127.0.0.1:3306
 #Host = 210.16.186.252:3326
-
+#Password = kptzhu@163.com
 #Host = 210.16.186.252:3326
 #Host = 127.0.0.1:3309
 #Name = equipment
@@ -73,7 +73,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo 
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306 
-Name = sfmc
+Name = tmrwatch2
 TablePrefix =
 
 ShowXormlog = false
@@ -114,3 +114,5 @@ MinimumReadSize = 0
 ;  heartBeat=18300046234623_p_breed 
 ;  TopicName=/k03txxLKFae/4623_p_breed/user/heatwatch/tmrBreed/post
 
+
+

go.mod

@@ -44,6 +44,7 @@ require (
 	github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 // indirect
 	github.com/bndr/gotabulate v1.1.2 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
+	github.com/qichengzx/coordtransform v0.0.0-20220708113031-010878418826 // indirect
 	github.com/recoilme/pudge v1.0.3 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect

go.sum

@@ -1419,6 +1419,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
 github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/qichengzx/coordtransform v0.0.0-20220708113031-010878418826 h1:xRzV3Mycb7VUY9QSs03UZbmgf7Og7RHEwF2zaHGyTXg=
+github.com/qichengzx/coordtransform v0.0.0-20220708113031-010878418826/go.mod h1:hrRiFtqNSi8E6C+3JsbPGjtCfyS9QFz90IORo3H6mts=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/recoilme/pudge v1.0.3 h1:h/9dEv5fRqtzM4lnO69kUoN+k7ukxxrW9NGb9ug0grM=
 github.com/recoilme/pudge v1.0.3/go.mod h1:VMvxBLVkrSStldckzCsETBXox3pfovfrnEchafXk8qA=

http/handle/api/ops.go

@@ -28,6 +28,7 @@ import (
 	"github.com/Anderson-Lu/gofasion/gofasion"
 	"github.com/astaxie/beego/logs"
 	"github.com/gin-gonic/gin"
+	"github.com/qichengzx/coordtransform"
 	"github.com/tealeg/xlsx"
 	"github.com/xormplus/xorm"
 )
@@ -8845,8 +8846,8 @@ func GetTmrEquipmentMuster(c *gin.Context) {
 			a, _ := strconv.ParseFloat(g.A, 64)
 			n, _ := strconv.ParseFloat(g.N, 64)
 			a1, n1 := ddmmtoddd(a, n)
-			g.A = fmt.Sprintf("%f", a1)
-			g.N = fmt.Sprintf("%f", n1)
+			g.A = fmt.Sprintf("%f", n1)
+			g.N = fmt.Sprintf("%f", a1)
 		}
 	}
 
@@ -8854,17 +8855,22 @@ func GetTmrEquipmentMuster(c *gin.Context) {
 }
 
 func ddmmtoddd(lng, lat float64) (float64, float64) {
-	// 计算度
-	lngDegree := int(lng / 100)
-	latDegree := int(lat / 100)
+	lngDegree := fmt.Sprintf("%f", lng/100)
+	lngDegreefloat, _ := strconv.ParseFloat(strings.Split(lngDegree, ".")[1], 64)
 
-	// 计算分
-	lngMinute := lng - float64(lngDegree*100)
-	latMinute := lat - float64(latDegree*100)
+	lngDegreeInt := int(lngDegreefloat * 1000000)
+	dd := lngDegreeInt / 100 * 100 / 60
+	fmt.Println(dd)
+	lngStr := strings.Split(lngDegree, ".")[0] + "." + strings.Replace(fmt.Sprintf("%d", lngDegreeInt/100*100/60), ".", "", 0)
 
-	// 转换为度.dddd格式
-	newLng := float64(lngDegree) + lngMinute/60.0
-	newLat := float64(latDegree) + latMinute/60.0
+	latDegree := fmt.Sprintf("%f", lat/100)
+	// latDegreeInt, _ := strconv.ParseInt(strings.Split(latDegree, ".")[1], 10, 64)
 
-	return newLng, newLat
+	latDegreefloat, _ := strconv.ParseFloat(strings.Split(latDegree, ".")[1], 64)
+	latDegreeInt := int(latDegreefloat * 1000000)
+	latStr := strings.Split(latDegree, ".")[0] + "." + strings.Replace(fmt.Sprintf("%d", latDegreeInt/100*100/60), ".", "", 0)
+
+	a, _ := strconv.ParseFloat(lngStr, 64)
+	b, _ := strconv.ParseFloat(latStr, 64)
+	return coordtransform.WGS84toGCJ02(b, a)
 }

http/handle/api/scheduled.go

@@ -133,16 +133,16 @@ func CronScheduled(ctx context.Context) {
 	// udFeedSync(pastureinfo)
 	// //圣牧自动同步前天有进行中的任务
 	// manualUdData(pastureinfo)
+	gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
+	// xdmy := cron.New()
+	// err = xdmy.AddFunc("0 30 4 * * *", func() {
+	// 	//现代牧业sap同步
+	// sap.SyncMaterialOutbound()
+	// 	// 光明ud同步
+	// 	fmt.Println(time.Now())
 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
-	xdmy := cron.New()
-	err = xdmy.AddFunc("0 30 4 * * *", func() {
-		//现代牧业sap同步
-		// sap.SyncMaterialOutbound()
-		// 光明ud同步
-		fmt.Println(time.Now())
-		gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
-	})
-	xdmy.Start()
+	// })
+	// xdmy.Start()
 	// InitMqttClient()
 }
 

http/handle/gm/udservice.go

@@ -20,12 +20,12 @@ import (
 // "../../../routers/restful"
 // http://172.16.86.95:8080/copartner_downloads?equipmentId=48ffa4de-7870-4b18-a052-9f8d3a46089a&farmId=ef275fb06fd847d88422517773e5a616&method=downloadpen
 func GmUdSync(pastureId, farmId string) {
-	UdMaterialIssuePush(pastureId, farmId, "")
-	UdFeedtempletPush(pastureId, farmId, "")
-	UdUtirPush(pastureId, farmId, "")
-	UdBarFeedRemainPush(pastureId, farmId, "")
+	// UdMaterialIssuePush(pastureId, farmId, "")
+	// UdFeedtempletPush(pastureId, farmId, "")
+	// UdUtirPush(pastureId, farmId, "")
+	// UdBarFeedRemainPush(pastureId, farmId, "")
 
-	UdBarSync(pastureId, farmId)
+	// UdBarSync(pastureId, farmId)
 	UdFeedSync(pastureId, farmId)
 }