sheep: 去除栏舍关键字牛

go.mod

@@ -3,7 +3,7 @@ module tmr-watch
 go 1.16
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20240416053821-34e917f3e0dc
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20240418053639-07f97848df89
 	gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/Anderson-Lu/gofasion v0.0.0-20190530065914-6a05b679ee48

go.sum

@@ -739,6 +739,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20240416035941-597a2e046a88 h1:+Pz9KmEp
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240416035941-597a2e046a88/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240416053821-34e917f3e0dc h1:Y1EuiS0zIIXGyyUjO/+XmiSs2mxLa9I/49DXSc/+dkY=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240416053821-34e917f3e0dc/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240418053639-07f97848df89 h1:dTMfNlgg0JslPWpWusZcV6aRN1dQAGHnVEELS1/XcoQ=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240418053639-07f97848df89/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584 h1:5RE5yrMMvnDITrnoX821mFl7dNYfsFA1osDobUV/TDo=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584/go.mod h1:VQ7WztVDQRlXE1dUu/Yqo3ZdhKsfv7IGJtV+vqNqJVw=
 github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=

migration/v0002_yq_bar.sql

@@ -33,7 +33,8 @@ eqcode,tname,datacaptureno,trim(tclassid) tclassid,
 (SELECT dictlist.label FROM dictlist JOIN dict ON dict.id=dictlist.pid WHERE dict.name='TMR设备类型' AND dict.ENABLE=1  and dictlist .enable=1  and value = tclassid) as tclassname,
 maxstirfeed,remark,enable,TRIM(id) id,TRIM(pastureid)pastureid,
 tcolor,imei,ifnull(datainterface,1),autozone,autosecond,if(autosecondname= '' or autosecondname is null,'禁用',autosecondname ) autosecondname,(select pasture_name from pasture where pastureid = tmr.pastureid) as pasturename,
-ifnull(gps,'')  gps ,volume,speed,volume_rate
+ifnull(gps,'')  gps ,volume,speed,
+TRIM(TRAILING ''.'' FROM TRIM(TRAILING ''0'' FROM FORMAT(volume_rate, 20))) AS volume_rate
 FROM
   tmr
 WHERE pastureid = ?  and  if(?=0,tclassid in (0,6,7),tclassid in (1,2,3,4))
@@ -50,7 +51,7 @@ params = 'eqcode,tname,datacaptureno,tclassid,tclassname,maxstirfeed,enable,rema
 where sqlname = 'updateTMR' and enable = 1;
 
 # 新增TMR设备撒料档位操作
-insert into apisql(sqlname,sqlstr,params) values ('getTmrGearList','select * from tmr_gear where tmr_id = ? order by gear', 'tmrId');
+insert into apisql(sqlname,sqlstr,params) values ('getTmrGearList','select * from tmr_gear where tmr_id = ? order by rev', 'tmrId');
 
 # 新增圈舍下拉框列表数据
 insert into apisql(sqlname,sqlstr,params) values ('getPenList','select id,pen from bar where pastureid = ? and enable = 1 and isdelete = 0 and pen is not null group by pen order by sort', 'pastureid');
@@ -96,7 +97,7 @@ CREATE TABLE `bar` (
     `length` DECIMAL(12,0) NOT NULL DEFAULT 0 COMMENT '栏舍长度',
     `pen` VARCHAR(30) DEFAULT NULL COMMENT '圈舍',
     PRIMARY KEY (`id`) USING BTREE,
-    UNIQUE KEY `ind_pastureId_pen_bname` (`pastureid`,`pen`,`bname`)
+    UNIQUE KEY `ind_pastureId_bname` (`pastureid`,`bname`)
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='栏舍';
 
 # 删除tmr表

models/tmr_gear.go

@@ -47,4 +47,6 @@ type TmrGearDetail struct {
 	Speed    float64 `json:"speed"`
 	UseInBar string  `json:"useinbar"`
 	Weight   float64 `json:"weight"`
+	Pid      int64   `json:"pid"`
+	FBarid   int64   `json:"fbarid"`
 }

module/sheep.go

@@ -7,9 +7,11 @@ import (
 	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
 	"gitee.com/xuyiping_admin/pkg/xerr"
 	"github.com/xormplus/xorm"
+	"go.uber.org/zap"
 	"strconv"
 	"tmr-watch/http/handle/restful"
 	"tmr-watch/models"
+	"tmr-watch/pkg/logger/zaplog"
 )
 
 // SearchTrmGearByTmrId 查询撒料电机档位数据
@@ -55,25 +57,28 @@ func CreateOrUpdateTmrGear(ctx context.Context, req *operationPb.UpdateOrCreateT
 
 func UseTmrGear(ctx context.Context, req *operationPb.UseGearRequest) ([]*models.TmrGearDetail, error) {
 	sqlName := fmt.Sprintf(
-		`SELECT sort,fname,weight,LENGTH,bcode,ccount,speed,gear_rate,useinbar FROM 
+		`SELECT sort,fname,weight,length,bcode,ccount,speed,gear_rate,useinbar,pid,fbarid FROM 
 		(SELECT a.sort,a.fname,a.lweight weight,a.fpid, IF(a.useinbartype=0,'转投剩料', IF(a.useinbartype=1,'撒','继续饲喂') ) useinbar, 
 		CONCAT(a.fbarid) fbarid,
 		CONCAT(a.pid) pid,
 		b.bcode,
 		b.length,
-		c.ccount,
+		c.cowcount AS ccount,
+		ROUND( c.ccountradio * c.cowcount / 100, 2 ) ccountratio,
 		d.speed,
-		(((a.lweight /  b.length) * f.volume) / d.volume_rate) / (60 * 60 / 1000 / d.speed)  AS gear_rate 
+		(((a.lweight /  b.length) * f.volume) / d.volume_rate) / (1 / (d.speed * 1000 / 3600)) * 60  AS gear_rate 
 		FROM  downloadplandtl2 a  
 		JOIN bar b ON a.fbarid = b.id  
-		JOIN feedp c ON c.barid = a.fbarid  
+		JOIN fpdetaildate c ON c.barid = a.fbarid  
 		JOIN downloadedplan g ON a.pid = g.id  
 		JOIN tmr d ON d.id = g.tmrid  
-		JOIN feedtemplet f ON c.ftid = f.id
+		JOIN feedtemplet f ON a.feedtempletid = f.id
 		WHERE a.pastureid = %s
 		AND a.pid= %s
 		AND d.id = %d
-		ORDER BY a.sort) AS B`, req.PastureId, req.Id, req.TmrId)
+        GROUP BY a.sort
+		ORDER BY a.sort
+	) AS B`, req.PastureId, req.Id, req.TmrId)
 
 	tx := restful.Engine.NewSession()
 	defer tx.Close()
@@ -83,6 +88,8 @@ func UseTmrGear(ctx context.Context, req *operationPb.UseGearRequest) ([]*models
 		return nil, xerr.WithStack(err)
 	}
 
+	zaplog.Info("UseTmrGear", zap.Any("resultList", resultList), zap.Any("sqlName", sqlName))
+
 	tmrGearDetailList := make([]*models.TmrGearDetail, 0)
 	for _, v := range resultList {
 		sort, _ := strconv.ParseInt(v["sort"], 10, 64)
@@ -93,7 +100,8 @@ func UseTmrGear(ctx context.Context, req *operationPb.UseGearRequest) ([]*models
 		ccount, _ := strconv.ParseInt(v["ccount"], 10, 64)
 		speed, _ := strconv.ParseFloat(v["speed"], 64)
 		gearRate, _ := strconv.ParseFloat(v["gear_rate"], 64)
-
+		pid, _ := strconv.ParseInt(v["pid"], 10, 64)
+		fbarid, _ := strconv.ParseInt(v["fbarid"], 10, 64)
 		tmrGearDetailList = append(tmrGearDetailList, &models.TmrGearDetail{
 			Sort:     int32(sort),
 			FName:    fname,
@@ -103,6 +111,8 @@ func UseTmrGear(ctx context.Context, req *operationPb.UseGearRequest) ([]*models
 			CCount:   int32(ccount),
 			Speed:    speed,
 			GearRate: gearRate,
+			Pid:      pid,
+			FBarid:   fbarid,
 		})
 	}
 

service/sheep/tmr_gear.go

@@ -70,6 +70,8 @@ func UseGear(ctx context.Context, req *operationPb.UseGearRequest) (*operationPb
 			Gear:     gear,
 			Ccount:   v.CCount,
 			GearRate: float32(v.GearRate),
+			Pid:      v.Pid,
+			Fbarid:   v.FBarid,
 		}
 		useGearDataList = append(useGearDataList, newData)
 	}