栏舍修改bug处理

conf/app.ini

@@ -47,8 +47,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
@@ -72,7 +72,7 @@ Host = 192.168.1.93:3326
 #Name = tmrgo
 #Password = kepaiteng!QAZ
 #Host = 222.73.129.15:31306
-Name = tmrwatch5
+Name = tmrwatch2
 TablePrefix =
 
 ShowXormlog = false

http/handle/api/ops.go

@@ -3513,10 +3513,11 @@ func UpdateFpdetailBar(c *gin.Context) {
 		}
 	}
 
-	for _, list := range fsion.Get("data").Array() {
+	fsionData := fsion.Get("data").Array()
+	for _, list := range fsionData {
 		ftmap := make(map[string]interface{})
-		ftmap["old"] = list.Get("old").ValueFloat64()
-		ftmap["new"] = list.Get("new").ValueFloat64()
+		ftmap["old"] = list.Get("old").ValueDefaultFloat64(0.0)
+		ftmap["new"] = list.Get("new").ValueDefaultFloat64(0.0)
 		ftmap["times"] = list.Get("times").ValueInt64()
 		ftmap["ptid"] = list.Get("ptid").ValueStr()
 		ftmap["ptsid"] = list.Get("ptsid").ValueStr()
@@ -3537,8 +3538,7 @@ func UpdateFpdetailBar(c *gin.Context) {
 		}
 
 		for _, fpd := range fpdDataList {
-
-			if fpd["times"].(int64) == ftmap["times"].(int64) && (fpd["ptid"].(string) == ftmap["ptid"].(string) || fpd["ptsid"].(string) == ftmap["ptsid"].(string)) {
+			if fpd["times"].(int64) == ftmap["times"].(int64) && (fpd["ptid"].(string) == ftmap["ptid"].(string)) {
 				fttype := -1
 				if ftmap["ptid"].(string) != "-1" {
 					fttype = 1
@@ -3641,7 +3641,7 @@ func UpdateFpdetailBar(c *gin.Context) {
 
 		}
 	}
-
+	fmt.Println("33333333333333")
 	tx.Commit()
 
 	now := time.Now()

http/handle/api/scheduled.go

@@ -36,7 +36,7 @@ func CronScheduled(ctx context.Context) {
 	defer tx.Close()
 
 	pastureinfo := new(udPastureInfo)
-	err := tx.SQL(`select column_default  as pastureid   from    information_schema.COLUMNS
+	err := tx.SQL(`select column_default  as pastureid,(select werks from pasture where pastureid = column_default)  werks  from    information_schema.COLUMNS
 	WHERE table_name = 'recweight' AND table_schema = ? AND column_name = 'pastureid'`, setting.DatabaseSetting.Name).GetFirst(pastureinfo).Error
 	if err != nil {
 		logs.Error(err)
@@ -133,7 +133,7 @@ func CronScheduled(ctx context.Context) {
 
 	//
 	// //圣牧自动同步前天有进行中的任务
-	manualUdData(pastureinfo)
+	// manualUdData(pastureinfo)
 
 	//现代牧业sap同步
 	// xdmy := cron.New()
@@ -143,7 +143,7 @@ func CronScheduled(ctx context.Context) {
 	// xdmy.Start()
 
 	//光明ud同步
-	// gm.UdFeedSync(pastureinfo.Pastureid)
+	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 
 	// gm.GmUdSync(pastureinfo.Pastureid, pastureinfo.Werks)
 

http/handle/api/spillage.go

@@ -1393,7 +1393,7 @@ GROUP BY fpd.ptsid`
 		sqlstr := `SELECT
 		lpplan.date,
 		-- ifnull((select eqcode from tmr where pastureid =lpplan.pastureid and id = lpplan.tmrid ),lpplan.tmrname) 
-		lpplan.tmrname tmrname,trim(lpplan.tmrid) tmrid,lpplan.sort,lpplan.sel,times timesInt,
+		lpplan.tmrname tmrname,trim(lpplan.tmrid) tmrid,lpplan.sort,lpplan.sel,lpplan.times timesInt,
 		CASE lpplan.times
 		WHEN 1 THEN
 		'第一班'

http/handle/gm/udservice.go

@@ -19,7 +19,7 @@ import (
 // "../../../routers/restful"
 
 func GmUdSync(pastureId, farmId string) {
-	fmt.Println(111)
+	UdBarFeedRemainPush(pastureId, farmId)
 }
 
 func UdBarSync(pastureId, farmId string) {
@@ -158,7 +158,7 @@ func UdUtirPush(pastureId, farmId string) error {
         "code": "1",
         "method": "uploadadddata",
         "resultData": %s,
-        "farmId": %s,
+        "farmId": "%s",
         "rowCount": %d,
         "errMessage": ""
     },
@@ -218,7 +218,7 @@ dd.fname,
         "code": "1",
         "method": "uploaddiliverdata",
         "resultData": %s,
-        "farmId": %s,
+        "farmId": "%s",
         "rowCount": %d,
         "errMessage": ""
     },
@@ -236,7 +236,7 @@ func UdBarFeedRemainPush(pastureId, farmId string) error {
 
 	tx := restful.Engine.NewSession()
 	defer tx.Close()
-	now := time.Now().AddDate(0, 0, 0).Format("2006-01-02")
+	now := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
 	dataList, err := tx.SQL(`SELECT
 	'' startTime,
 	'' endTime,
@@ -263,7 +263,7 @@ WHERE
         "code": "1",
         "method": "uploadoverplusdata",
         "resultData": %s,
-        "farmId": %s,
+        "farmId":"%s",
         "rowCount": %d,
         "errMessage": ""
     },
@@ -273,6 +273,7 @@ WHERE
 }`
 	reqJson = fmt.Sprintf(reqJson, string(dataByte), farmId, len(dataList))
 	//  '0饲喂  1剩料  2原料  3栏舍  4配方 5栏舍牛头数 6库存',
+	fmt.Println(reqJson)
 	postPush(reqJson, 1, tx, pastureId)
 	return nil
 }
@@ -319,7 +320,7 @@ WHERE
         "code": "1",
         "method": "getfeedtempletinfo",
         "resultData": %s,
-        "farmId": %s,
+        "farmId": "%s",
         "rowCount": %d,
         "errMessage": ""
     },
@@ -355,7 +356,6 @@ func postPush(data string, msgtype int, tx *xorm.Session, pastureId string) {
 	defer resp.Body.Close()
 	body, _ := ioutil.ReadAll(resp.Body)
 	fmt.Println(string(body))
-	fmt.Println("11111111111111", time.Now())
 	tx.Exec(` insert into saplog(pastureId,request,response,status,msgtext,createTime,msgtype,dataDate,url)
 	values(?,?,?,?,?,now(),?,now(),?)`, pastureId, data, string(body), "", "", msgtype, url)