添加参数

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductInfoController.java

@@ -51,7 +51,7 @@ public class DmpProductInfoController {
      * @param dmpProductInfoRequest
      * @return
      */
-    @GetMapping("/page")
+    @PostMapping("/page")
     public ApiResult<CommonPage<DmpProductInfo>> page(@RequestBody DmpProductInfoRequest dmpProductInfoRequest)
     {
         return ApiResult.success(dmpProductInfoService.page(dmpProductInfoRequest));

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpProductInfo.java

@@ -3,6 +3,7 @@ package com.usky.iot.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,6 +20,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@TableName("dmp_product")
 public class DmpProductInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpSoftwareUpgrade.java

@@ -2,11 +2,12 @@ package com.usky.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 软件升级信息表
@@ -49,6 +50,11 @@ public class DmpSoftwareUpgrade implements Serializable {
      */
     private Integer packageLength;
 
+    /**
+     * softwareId
+     */
+    private String softwareId;
+
     /**
      * 校验码
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java

@@ -73,6 +73,7 @@ public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInf
         LambdaQueryWrapper<DmpProductInfo> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery
                 .eq(StringUtils.isNotBlank(piRequest.getProductName()),DmpProductInfo::getProductName,piRequest.getProductName())
+                .eq(StringUtils.isNotBlank(piRequest.getDeviceModel()),DmpProductInfo::getDeviceModel,piRequest.getDeviceModel())
                 .eq(DmpProductInfo::getDeleteFlag,0);
         List<DmpProductInfo> records = page.getRecords();
         List<Integer> productIds = records.stream().map(DmpProductInfo::getId).collect(Collectors.toList());

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DmpProductInfoRequest.java

@@ -18,4 +18,8 @@ public class DmpProductInfoRequest {
      * 产品名称
      */
     private String productName;
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
 }