查询

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/RawDataServiceImpl.java

@@ -158,20 +158,17 @@ public class RawDataServiceImpl extends ServiceImpl<RawDataMapper, RawData> impl
     @Override
     public Result listWeightByDevicCode(Map<String, String> paramsMap) {
         LocalDate today = LocalDate.now();
-        LocalDateTime midnight = LocalDateTime.of(today, LocalTime.MIDNIGHT);
-        LocalDateTime maxTime = LocalDateTime.of(today, LocalTime.MAX);
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
-            startDate += " 00:00:00";
-            endDate += " 23:59:59";
-        }else {
+        if (StringUtils.isBlank(startDate) && StringUtils.isBlank(endDate)){
             startDate = DateUtil.beginOfDay(new Date()).toString();
             endDate =  DateUtil.endOfDay(new Date()).toString();
         }
         String deviceCodes = paramsMap.get("deviceCode");
+        if (ObjectUtil.isEmpty(deviceCodes)){
+            return new Result(10001,"请选择笼位!",false);
+        }
         String[] deviceCode = deviceCodes.split(",");
         List<DeviceFarmConfig> deviceFarmConfigs = deviceFarmConfigMapper.selectList(new QueryWrapper<DeviceFarmConfig>().lambda().eq(DeviceFarmConfig::getFarmId, 21));
         List<LocalTime> startTimes = deviceFarmConfigs.stream().map(config -> LocalTime.of(config.getStartHour(), 0, 0)).collect(Collectors.toList());