#FIX 设备经营统计

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

@@ -169,8 +169,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByDay(Long deviceId, Long mercId, String dateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
-        return getOneData(value, deviceId, mercId, dateValue);
+         return getOneData(EnumDeviceDataType.DAY.getCode(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -181,8 +180,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneDay(Long mercId, String dateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
-        return getMercListData(value, mercId, dateValue);
+         return getMercListData(EnumDeviceDataType.DAY.getCode(), mercId, dateValue);
     }
 
 
@@ -194,8 +192,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getMercDataOneMonth(Long mercId, String dateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.MONTH.getCode(), String.class);
-        return getMercListData(value, mercId, dateValue);
+         return getMercListData(EnumDeviceDataType.MONTH.getCode(), mercId, dateValue);
     }
 
     /**
@@ -207,8 +204,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByMonth(Long deviceId, Long mercId, String dateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.MONTH.getCode(), String.class);
-        return getOneData(value, deviceId, mercId, dateValue);
+         return getOneData(EnumDeviceDataType.MONTH.getCode(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -220,8 +216,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public DeviceDataDto.Vo getByYear(Long deviceId, Long mercId, String dateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.YEAR.getCode(), String.class);
-        return getOneData(value, deviceId, mercId, dateValue);
+         return getOneData(EnumDeviceDataType.YEAR.getCode(), deviceId, mercId, dateValue);
     }
 
     /**
@@ -270,8 +265,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
      * @return
      */
     public List<DeviceDataDto.Vo> getListByDay(Long deviceId, Integer startDateValue, Integer endDateValue) {
-        String value = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
-        return getListData(value, deviceId, startDateValue, endDateValue);
+         return getListData(EnumDeviceDataType.DAY.getCode(), deviceId, startDateValue, endDateValue);
     }
 
     /**

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

@@ -775,7 +775,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         BeanUtil.copyProperties(pageBean, pageData);
         if (CollUtil.isNotEmpty(records)) {
             List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
-            String type = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
+            String type = EnumDeviceDataType.DAY.getCode();
             String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
             //查询当天
             DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()