web平台接口调整

portal-service-common/src/main/java/com/hfln/portal/common/request/admin/DeviceAddParam.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -21,6 +22,7 @@ public class DeviceAddParam extends BaseVO {
      * 设备ID
      */
     @Schema(description = "设备ID")
+    @NotBlank ( message = "设备ID不能为空!")
     private String clientId;
 
     /**
@@ -38,7 +40,8 @@ public class DeviceAddParam extends BaseVO {
     /**
      * 设备类型
      */
-    @Schema(description = "设备类型")
+    @Schema(description = "设备类型 ,下拉选择 LNA / LNB")
+    @NotBlank ( message = "设备类型不能为空!")
     private String devType;
 
     /**
@@ -56,7 +59,8 @@ public class DeviceAddParam extends BaseVO {
     /**
      * 软件版本号
      */
-    @Schema(description = "软件版本号")
+    @Schema(description = "软件版本号" )
+    @NotBlank ( message = "软件版本号不能为空!")
     private String software;
 
     /**

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceListQueryReq.java

@@ -4,20 +4,24 @@ import com.hfln.portal.common.vo.PageVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
 
 @Data
 public class DeviceListQueryReq extends PageVo {
 
-    @NotEmpty(message = "设备Id不能为空")
-    @Schema(description = "设备ID", required = true)
+    @Schema(description = "设备ID")
     private String clientId;
 
-    @Schema(description = "起始时间")
+    @Schema(description = "设备名称")
+    private String devName;
+
+    @Schema(description = "设备状态： 0-离线,1-在线")
+    private Integer online;
+
+    @Schema(description = "起始时间 格式yyyy-MM-dd")
     private LocalDate createTimeStart;
 
-    @Schema(description = "结束时间")
+    @Schema(description = "结束时间 格式yyyy-MM-dd")
     private LocalDate createTimeEnd;
 
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/AdminGatewayImpl.java

@@ -109,7 +109,9 @@ public class AdminGatewayImpl implements AdminGateway {
 
     @Override
     public PageRecord<DeviceDTO> queryDevList(DeviceListQueryReq queryReq) {
-
+        if (queryReq.getPageSize() == null || queryReq.getPageSize() <= 0){
+            queryReq.setPageSize(10);
+        }
         // 执行分页查询
         Page<DevInfo> devInfoPage = devInfoService.queryDevList(queryReq);
         // 换为目标VO

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -157,7 +157,12 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
         if (StringUtils.hasText(queryReq.getClientId())) {
             queryWrapper.like(DevInfo::getClientId, queryReq.getClientId());
         }
-
+        if (StringUtils.hasText(queryReq.getDevName())){
+            queryWrapper.like(DevInfo::getDevName, queryReq.getDevName());
+        }
+        if (queryReq.getOnline() != null){
+            queryWrapper.eq(DevInfo::getOnline, queryReq.getOnline());
+        }
 
         // 3. 添加日期条件
         if (Objects.nonNull(queryReq.getCreateTimeStart())) {