fix: 时间筛选

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/service/JfcloudSensorDataService.java

@@ -70,6 +70,8 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
         Assert.notNull(roads, "roads cannot be null");
         Assert.notNull(startTimeStr, "startTime cannot be null");
         Assert.notNull(endTimeStr, "endTime cannot be null");
+        startTimeStr=startTimeStr.trim();
+        endTimeStr=endTimeStr.trim();
         // 如果只有日期部分，则手动补充时间部分（00:00:00）
         if (startTimeStr.length() == 10) {
             startTimeStr += " 00:00:00";
@@ -154,10 +156,8 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
         DateTimeFormatter outputFormatter = DateTimeFormatter.ISO_DATE_TIME;
         // Parse the input time string to LocalDateTime (in system default zone)
         LocalDateTime localDateTime = LocalDateTime.parse(time, inputFormatter);
-
         // Convert the LocalDateTime to Instant (UTC time zone)
         Instant instant = localDateTime.atZone(ZoneOffset.UTC).toInstant();
-
         // Format the Instant to ISO 8601
         return outputFormatter.format(instant.atZone(ZoneOffset.UTC));
     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/service/AppDeviceService.java

@@ -16,7 +16,6 @@ import com.github.jfcloud.influxdb.service.JfcloudInfluxDBService;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
 import vip.xiaonuo.coldchain.modular.app.param.*;
 import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
@@ -27,7 +26,10 @@ import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 @RequiredArgsConstructor
@@ -53,7 +55,7 @@ public class AppDeviceService {
         // 创建监控目标分页查询参数对象
         MonitorTargetPageParam monitorTargetPageParam = new MonitorTargetPageParam();
         // 获取当前登录用户的 ID，并设置到查询参数中
-        monitorTargetPageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
+//        monitorTargetPageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
         // 设置分页参数：当前页和每页记录数
         monitorTargetPageParam.setCurrent(appDevicePageParam.getCurrent());
         monitorTargetPageParam.setSize(appDevicePageParam.getSize());

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -73,7 +73,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
         }
-        queryWrapper.lambda().eq(MonitorTarget::getCreateOrg,loginUser.getOrgId()).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, loginUser.getOrgId()).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         //获取设备区域列表并赋值返回
         page.getRecords().forEach(monitorTarget -> {
@@ -133,7 +133,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         } else {
             queryWrapper.eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
         }
-        queryWrapper.eq(MonitorTarget::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE).orderByDesc(MonitorTarget::getCreateTime);
+        queryWrapper.eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE).orderByDesc(MonitorTarget::getCreateTime);
         List<MonitorTarget> monitorTargetList = list(queryWrapper);
         monitorTargetList.forEach(monitorTarget -> {
             monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
@@ -147,14 +147,12 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
             queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
         }
-        if (ObjectUtil.isNull(monitorTargetPageParam.getUserId())) {
-//            queryWrapper.lambda().eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
-        } else {
+        if (ObjectUtil.isNotNull(monitorTargetPageParam.getUserId())) {
             queryWrapper.lambda().eq(MonitorTarget::getCreateUser, monitorTargetPageParam.getUserId());
         }
         if (ObjectUtil.isNull(monitorTargetPageParam.getOrgId())) {
             queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, StpLoginUserUtil.getLoginUser().getOrgId());
-        } else {
+        }else {
             queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, monitorTargetPageParam.getOrgId());
         }
         if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
@@ -163,7 +161,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTarget::getStatus).orderByDesc(MonitorTarget::getCreateTime);
         }
-        queryWrapper.lambda().eq(MonitorTarget::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.lambda().eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorTarget> page1 = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
         Page<MonitorTarget> rlt = this.page(page1, queryWrapper);
         //获取设备区域列表并赋值返回