浏览代码

时区修复

baishaojie 1 天之前
父节点
当前提交
3561ff1d8a
共有 6 个文件被更改,包括 8 次插入5 次删除
  1. 二进制
      TMRWatchComm
  2. 二进制
      TMRWatchComm.zip
  3. 2 2
      http/handle/api/ops.go
  4. 4 1
      http/handle/api/scheduled.go
  5. 2 2
      http/handle/ymy/ymy.go
  6. 二进制
      tmr-watch.exe

二进制
TMRWatchComm


二进制
TMRWatchComm.zip


+ 2 - 2
http/handle/api/ops.go

@@ -1098,7 +1098,7 @@ func GetRJSBData(c *gin.Context) {
 	returntype := fsion.Get("returntype").ValueDefaultStr("map")
 	month := fsion.Get("month").ValueDefaultStr("map")
 	logging.Info("GetUpkeepPlan ", c.Keys, sqlnamestr, month)
-	// pagecount = 1
+	pagecount = 1
 	tx := restful.Engine.NewSession()
 	err := tx.Begin()
 	defer func() {
@@ -1170,7 +1170,7 @@ func GetRJSBData(c *gin.Context) {
 				go func(value map[string]interface{}) {
 					defer wg.Done()
 					// ,havebutton = 1
-					_, err = tx.SQL(`update downloadedplan set  artificial = 2,havebutton = 1 where id = ? and pastureid = ? `, value["projuctid"], value["pastureid"]).Execute()
+					_, err = tx.SQL(`update downloadedplan set  artificial = 2 where id = ? and pastureid = ? `, value["projuctid"], value["pastureid"]).Execute()
 				}(value)
 			}
 			wg.Wait()

+ 4 - 1
http/handle/api/scheduled.go

@@ -1086,7 +1086,7 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 
 func manualUdData(pastureinfo *udPastureInfo) {
 	c := cron.New()
-	c.AddFunc("10 10 * * *", func() {
+	c.AddFunc("10 08 * * *", func() {
 		tx := restful.Engine.NewSession()
 		defer tx.Close()
 		now := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
@@ -2255,3 +2255,6 @@ func getTFeedRecipesKind(finalData []*gofasion.Fasion, tx *xorm.Session, pasture
 		}
 	}
 }
+
+
+

+ 2 - 2
http/handle/ymy/ymy.go

@@ -43,7 +43,7 @@ func YmySyncBar(farmId, pastureId string) {
 	"regCode": "cpt180511",
 	"secret": "67a74fd5748054ac67b6fc433e9249b0"}`
 
-	barPull("http://dairy.yimucloud.com/dairy/external/api", fmt.Sprintf(reqJson, farmId), 3, tx, pastureId)
+	barPull("http://dairy.yimufarm.com/dairy/external/api", fmt.Sprintf(reqJson, farmId), 3, tx, pastureId)
 }
 
 func barPull(url, data string, msgtype int, tx *xorm.Session, pastureId string) {
@@ -380,7 +380,7 @@ ORDER BY dr.operatetime DESC LIMIT 1),"") as tmrName,d.tmrtname equipmentId,fp.c
 func postPush(data string, msgtype int, tx *xorm.Session, pastureId string) {
 
 	// forwardingReq := new(ForwardingReq)
-	url := "http://dairy.yimucloud.com/dairy/external/api"
+	url := "http://dairy.yimufarm.com/dairy/external/api"
 	// forwardingReq.Method = "POST"
 	// forwardingReq.Body = data
 	// jsonStr, _ := json.Marshal(forwardingReq)

二进制
tmr-watch.exe