修改一些bug:名称排序,风机不显示期次发电量,场站指标里有多余数据

electricity/meter/src/main/java/com/gyee/gaia/meter/controller/MeterInfoController.java

@@ -47,6 +47,8 @@ public class MeterInfoController {
             @RequestParam(defaultValue = "25") int perPage
     ) {
         ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getBottomInfoByWindId(windId, meterType, meterClass, name, startTime, endTime);
+        // 进行排序
+        meterInfoByWindIdList.sort(Comparator.comparing(MeterInfoVo::getName));
         // 进行分页处理
         int totalItems = meterInfoByWindIdList.size();
         int startIndex = (page - 1) * perPage;
@@ -101,7 +103,7 @@ public class MeterInfoController {
 
 
     /**
-     * 获取根据传入不同参数获取每日场站指标数据(计算点)
+     * 每日场站指标数据(计算点)
      *
      * @param windId     风场ID
      * @param meterType  测点一级类型
@@ -142,7 +144,7 @@ public class MeterInfoController {
     }
 
     /**
-     * 获取根据传入不同参数获取每月场站指标数据(计算点)
+     * 每月场站指标数据(计算点)
      *
      * @param windId     风场ID
      * @param meterType  测点一级类型
@@ -221,7 +223,7 @@ public class MeterInfoController {
 
 
     /**
-     * 获取根据传入不同参数获取每月底码信息
+     * 每月底码信息
      *
      * @param windId     风场ID
      * @param meterType  测点一级类型
@@ -245,6 +247,8 @@ public class MeterInfoController {
             @RequestParam(defaultValue = "25") int perPage
     ) {
         ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getBottomInfoMonthByWindId(windId, meterType, meterClass, name, startTime, endTime);
+        // 进行排序
+        meterInfoByWindIdList.sort(Comparator.comparing(MeterInfoVo::getName));
         // 进行分页处理
         int totalItems = meterInfoByWindIdList.size();
         int startIndex = (page - 1) * perPage;
@@ -323,6 +327,8 @@ public class MeterInfoController {
             @RequestParam(defaultValue = "25") int perPage
     ) {
         ArrayList<MeterInfoVo> meterInfoByWindIdList = getMeterInfo.getBottomInfoYearByWindId(windId, meterType, meterClass, name, startTime, endTime);
+        // 进行排序
+        meterInfoByWindIdList.sort(Comparator.comparing(MeterInfoVo::getName));
         // 进行分页处理
         int totalItems = meterInfoByWindIdList.size();
         int startIndex = (page - 1) * perPage;

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterInfo/GetMeterInfo.java

@@ -358,7 +358,7 @@ public class GetMeterInfo {
                         meterInfoVo.setEndCode(meterInfoBottomcode.getEndValue());
                     }
                 }
-                meterInfoVo.setRdl(ydl);
+                meterInfoVo.setRdl(ydl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
                 meterInfoVos.add(meterInfoVo);
             }
         }
@@ -389,7 +389,7 @@ public class GetMeterInfo {
         //条件构造器查询计算点
         List<MeterPoint> meterPoints = meterPointService.list(new QueryWrapper<MeterPoint>()
                 .eq("windpowerstation_id", windId)
-                .like("property", "JSD%")
+                .in("property", "JSD","JSD_QCFDL")
                 .eq(StringUtil.isNotBlank(meterType), "meter_type", meterType)
                 .eq(StringUtil.isNotBlank(meterClass), "meter_class", meterClass)
                 .eq(StringUtil.isNotBlank(name), "name", name)
@@ -586,7 +586,7 @@ public class GetMeterInfo {
                         meterInfoVo.setEndCode(meterInfoBottomcode.getEndValue());
                     }
                 }
-                meterInfoVo.setRdl(ndl);
+                meterInfoVo.setRdl(ndl.divide(BigDecimal.valueOf(10000),4,RoundingMode.HALF_EVEN));
                 meterInfoVos.add(meterInfoVo);
             }
         }
@@ -617,7 +617,7 @@ public class GetMeterInfo {
         //条件构造器查询计算点
         List<MeterPoint> meterPoints = meterPointService.list(new QueryWrapper<MeterPoint>()
                 .eq("windpowerstation_id", windId)
-                .like("property", "JSD%")
+                .in("property", "JSD","JSD_QCFDL")
                 .eq(StringUtil.isNotBlank(meterType), "meter_type", meterType)
                 .eq(StringUtil.isNotBlank(meterClass), "meter_class", meterClass)
                 .eq(StringUtil.isNotBlank(name), "name", name)

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meterInfo/GetPowerstation_Type_Class_Name.java

@@ -53,7 +53,7 @@ public class GetPowerstation_Type_Class_Name {
         //判断传入参数是否为空,并根据传入参数在meterPoint查询计算点
         if (windId != null) {
             List<MeterPoint> meterTypeList = meterPointService.list(new QueryWrapper<MeterPoint>()
-                    .eq("property", "JSD")
+                    .in("property", "JSD","JSD_QCFDL")
                     .eq("windpowerstation_id", windId)
                     .eq(StringUtils.isNotBlank(type), "meter_type", type)
                     .eq(StringUtils.isNotBlank(meterClass), "meter_class", meterClass)