推送地磅数据

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

@@ -49,6 +49,9 @@ public class KwsPrinterManageService {
 //            // 如果没有可查询的企业ID，直接返回空结果
 //            return PageResult.build(reqVo.getPageNum(), reqVo.getPageSize(), 0L, Collections.emptyList());
 //        }
+        if (Objects.isNull(reqVo.getEntId())){
+            throw new IotException("企业ID不能为空");
+        }
         // 执行数据库分页查询
         IPage<KwsPrinter> page = kwsPrinterRepository.pageQuery(reqVo.getPageNum(), reqVo.getPageSize(),
                 reqVo.getPrinterName(), reqVo.getEntId());
@@ -89,6 +92,7 @@ public class KwsPrinterManageService {
         // 构建打印机实体对象
         KwsPrinter printer = new KwsPrinter()
                 .setEntId(reqVo.getEntId())
+                .setEntName(reqVo.getEntName())
                 .setPrinterName(reqVo.getPrinterName())
                 .setPrinterType(reqVo.getPrinterType())
                 .setUsefulLife(reqVo.getUsefulLife())
@@ -122,6 +126,7 @@ public class KwsPrinterManageService {
         validateSaveReq(reqVo, printer.getId());
         // 更新字段
         printer.setEntId(reqVo.getEntId());
+        printer.setEntName(reqVo.getEntName());
         printer.setPrinterName(reqVo.getPrinterName());
         printer.setPrinterType(reqVo.getPrinterType());
         printer.setUsefulLife(reqVo.getUsefulLife());

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

@@ -362,6 +362,10 @@ public class WeighbridgeRecordManage {
             log.debug("请求参数为空，使用默认空参数对象");
         }
 
+        if (Objects.isNull(reqVo.getEntId())) {
+            throw new IotException(ErrorCodeEnum.PARAM_ERROR, "企业ID不能为空");
+        }
+
         // 处理分页参数，设置默认值
         int pageNum = reqVo.getPageNum() <= 0 ? 1 : reqVo.getPageNum();
         int pageSize = reqVo.getPageSize() <= 0 ? 10 : reqVo.getPageSize();
@@ -369,11 +373,12 @@ public class WeighbridgeRecordManage {
 
         // 第一步：查询符合条件的地磅设备
         // 根据ID、名称、唯一编码等条件筛选未删除的地磅设备
-        log.debug("查询符合条件的地磅设备，地磅ID: {}, 地磅名称: {}, 唯一编码: {}", 
-                reqVo.getWeighbridgeId(), reqVo.getWeighbridgeName(), reqVo.getUniqueCode());
+        log.debug("查询符合条件的地磅设备，地磅ID: {}, 地磅名称: {}, 唯一编码: {},企业id：{}",
+                reqVo.getWeighbridgeId(), reqVo.getWeighbridgeName(), reqVo.getUniqueCode(), reqVo.getEntId());
         
         List<KwsWeighbridge> weighbridgeList = kwsWeighbridgeRepository.list(Wrappers.<KwsWeighbridge>lambdaQuery()
                 .eq(KwsWeighbridge::getDelFlag, 0)
+                .eq(Objects.nonNull(reqVo.getEntId()), KwsWeighbridge::getEntId, reqVo.getEntId())
                 .eq(Objects.nonNull(reqVo.getWeighbridgeId()), KwsWeighbridge::getId, reqVo.getWeighbridgeId())
                 .like(StringUtils.isNotBlank(reqVo.getWeighbridgeName()), KwsWeighbridge::getWeighbridgeName, reqVo.getWeighbridgeName())
                 .like(StringUtils.isNotBlank(reqVo.getUniqueCode()), KwsWeighbridge::getUniqueCode, reqVo.getUniqueCode()));
@@ -498,13 +503,18 @@ public class WeighbridgeRecordManage {
             reqVo = new WeighbridgeRecordPageReqVo();
             log.debug("请求参数为空，使用默认空参数对象");
         }
+
+        if (Objects.isNull(reqVo)) {
+            throw new IotException("请求参数为空");
+        }
         
         // 先查询可用地磅，后续按 uniqueCode 与 weighbridge_records.weighbridge_code 关联
-        log.debug("查询符合条件的地磅设备，地磅ID: {}, 地磅名称: {}, 唯一编码: {}", 
-                reqVo.getWeighbridgeId(), reqVo.getWeighbridgeName(), reqVo.getUniqueCode());
+        log.debug("查询符合条件的地磅设备，地磅ID: {}, 地磅名称: {}, 唯一编码: {},企业Id：{}",
+                reqVo.getWeighbridgeId(), reqVo.getWeighbridgeName(), reqVo.getUniqueCode(),reqVo.getEntId());
         
         List<KwsWeighbridge> weighbridgeList = kwsWeighbridgeRepository.list(Wrappers.<KwsWeighbridge>lambdaQuery()
                 .eq(KwsWeighbridge::getDelFlag, 0)
+                .eq(Objects.nonNull(reqVo.getEntId()), KwsWeighbridge::getEntId, reqVo.getEntId())
                 .eq(Objects.nonNull(reqVo.getWeighbridgeId()), KwsWeighbridge::getId, reqVo.getWeighbridgeId())
                 .like(StringUtils.isNotBlank(reqVo.getWeighbridgeName()), KwsWeighbridge::getWeighbridgeName, reqVo.getWeighbridgeName())
                 .like(StringUtils.isNotBlank(reqVo.getUniqueCode()), KwsWeighbridge::getUniqueCode, reqVo.getUniqueCode()));

iot-platform-manager/src/main/java/com/platform/api/request/PrinterSaveReqVo.java

@@ -27,6 +27,11 @@ public class PrinterSaveReqVo implements Serializable {
      */
     @Schema(description = "企业ID")
     private Long entId;
+    /**
+     * 企业名称。
+     */
+    @Schema(description = "企业名称")
+    private String entName;
 
     /**
      * 打印机名称。

iot-platform-manager/src/main/java/com/platform/api/request/WeighbridgeRecordPageReqVo.java

@@ -85,4 +85,8 @@ public class WeighbridgeRecordPageReqVo extends PageRequest implements Serializa
     @Schema(description = "接收结束时间，格式 yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receiveEndTime;
+    /**
+     * 企业ID
+     */
+    private Long entId;
 }