推送地磅数据

iot-platform-manager/src/main/java/com/platform/api/manager/KwsPrinterManageService.java

@@ -6,17 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.platform.api.request.PrinterPageReqVo;
 import com.platform.api.request.PrinterSaveReqVo;
 import com.platform.api.request.PrinterStatusReqVo;
-import com.platform.api.response.PlatformEnterpriseResVo;
 import com.platform.api.response.PrinterDetailResVo;
 import com.platform.api.response.PrinterPageResVo;
 import com.platform.entity.KwsPrinter;
 import com.platform.exception.IotException;
 import com.platform.result.HttpV1Status;
 import com.platform.result.PageDataResult;
-import com.platform.result.PageResult;
 import com.platform.service.KwsPrinterRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +52,9 @@ public class KwsPrinterManageService {
         // 执行数据库分页查询
         IPage<KwsPrinter> page = kwsPrinterRepository.pageQuery(reqVo.getPageNum(), reqVo.getPageSize(),
                 reqVo.getPrinterName(), reqVo.getEntId());
+        if (CollectionUtils.isEmpty(page.getRecords())){
+            return PageDataResult.empty(reqVo.getPageNum(), reqVo.getPageSize());
+        }
         // 构建返回结果，填充企业名称等额外信息
         return PageDataResult.of(page, buildPageRes(page.getRecords()));
     }

iot-platform-manager/src/main/java/com/platform/api/manager/KwsWeighbridgeManageService.java

@@ -20,6 +20,7 @@ import com.platform.result.PageResult;
 import com.platform.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -80,6 +81,9 @@ public class KwsWeighbridgeManageService {
         IPage<KwsWeighbridge> page = kwsWeighbridgeRepository.pageQuery(reqVo.getPageNum(), reqVo.getPageSize(),
                 reqVo.getWeighbridgeName(), reqVo.getEntId());
         // 构建并返回响应结果
+        if (CollectionUtils.isNotEmpty(page.getRecords())){
+            return PageDataResult.empty(reqVo.getPageNum(), reqVo.getPageSize());
+        }
         return PageDataResult.of(page, buildPageRes(page.getRecords()));
     }
 

iot-platform-manager/src/main/java/com/platform/api/manager/WeighbridgeRecordManage.java

@@ -23,6 +23,7 @@ import com.platform.service.WeighbridgeRecordService;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -435,7 +436,9 @@ public class WeighbridgeRecordManage {
                         .orderByDesc(WeighbridgeRecord::getId));
 
         log.info("地磅记录分页查询完成，总记录数: {}, 当前页记录数: {}", recordPage.getTotal(), recordPage.getRecords().size());
-
+        if (CollectionUtils.isEmpty(recordPage.getRecords())){
+            return PageDataResult.empty(pageNum, pageSize);
+        }
         // 第五步：组装响应数据
         // 将地磅记录实体转换为响应VO，并关联地磅设备的详细信息
         List<WeighbridgeRecordResVo> resList = recordPage.getRecords().stream().map(record -> {