修改电量排名接口

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -898,7 +898,7 @@ public class MonitorFanIdxController extends BaseController {
                 monthDataFJ.add(monthMap);
                 yearDataFJ.add(yearMap);
             } else {
-                querySql = " and frontModule = '逆变器'";
+                querySql = " and frontModule =~/逆变器/";
                 Map<String, Object> map = monitorFanIndicator.generatingCapacity(gatewayId,querySql);
                 Map<String, Object> dayMap = new HashMap<>();
                 Map<String, Object> monthMap = new HashMap<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1870,7 +1870,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public Map<String, Object>  generatingCapacity (String gatewayId,String query){
-        String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName='日发电量' or  equipmentIndexName='月发电量' or  equipmentIndexName='年发电量'";
+        String querySql = " SELECT * FROM indicators_"+gatewayId+" WHERE equipmentIndexName=~/发电量/";
         if (null != query){
             querySql = querySql + " "+  query;
         }