#FIX 商家经营统计

device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -140,8 +140,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByDay(Long deviceId, Long mercId, String dateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
-        return getOneData(type, deviceId, mercId, dateValue);
+        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -152,8 +151,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneDay(Long mercId, String dateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
-        return getMercListData(type, mercId, dateValue);
+        return getMercListData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), mercId, dateValue);
     }
 
 
@@ -165,8 +163,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneMonth(Long mercId, String dateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), String.class);
-        return getMercListData(type, mercId, dateValue);
+        return getMercListData(DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), mercId, dateValue);
     }
 
     /**
@@ -178,8 +175,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByMonth(Long deviceId, Long mercId, String dateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), String.class);
-        return getOneData(type, deviceId, mercId, dateValue);
+        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_MONTH.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -191,8 +187,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByYear(Long deviceId, Long mercId, String dateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_YEAR.getKey(), String.class);
-        return getOneData(type, deviceId, mercId, dateValue);
+        return getOneData(DictSonEnum.DEVICE_DATA_TYPE_YEAR.getKey(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -241,8 +236,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getListByDay(Long deviceId, Integer startDateValue, Integer endDateValue) {
-        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
-        return getListData(type, deviceId, startDateValue, endDateValue);
+        return getListData(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), deviceId, startDateValue, endDateValue);
     }
 
     /**