Browse Source

风机曲线表格页查询条件修改

songhaodong 2 years ago
parent
commit
bc5dd4bd50

+ 3 - 2
ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/WindTurbinePowerCurveService.java

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.service;
 
+import cn.hutool.core.convert.Convert;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.data.entity.FanUnitInfo;
 import com.jiayue.ipfcst.common.data.entity.WindSpeedPointInfo;
@@ -188,12 +189,12 @@ public class WindTurbinePowerCurveService {
 
       // 风机编号模糊查询
       if (!speed.equals("null")) {
-        predicates.add(cb.equal(root.get("speed"), speed));
+        predicates.add(cb.equal(root.get("speed"), Convert.toFloat(speed)));
       }
 
       // 风向查询
       if (!power.equals("null")) {
-        predicates.add(cb.equal(root.get("power"), power));
+        predicates.add(cb.equal(root.get("power"), Convert.toFloat(power)));
       }
 
       // 风速查询