系统集成配置接口

service-sas/service-sas-biz/src/main/java/com/usky/sas/controller/web/SasNetworkConfigController.java

@@ -1,8 +1,10 @@
 package com.usky.sas.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.sas.domain.SasSystemWlanConfig;
 import com.usky.sas.service.SasSystemWlanConfigService;
+import com.usky.sas.service.vo.NetworkConfigPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -14,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 网络配置接口
  *
  * 对应 API 文档：
- * GET /prod-api/service-sas/network/config
+ * GET /prod-api/service-sas/network/config  分页查询
  * PUT /prod-api/service-sas/network/config
  */
 @RestController
@@ -25,11 +27,12 @@ public class SasNetworkConfigController {
     private SasSystemWlanConfigService wlanConfigService;
 
     /**
-     * 查询网络配置
+     * 分页查询网络配置
+     * 请求参数：current=1, size=10, name（可选）, ipAddr（可选）, status（可选）
      */
     @GetMapping("/config")
-    public ApiResult<SasSystemWlanConfig> getConfig() {
-        return ApiResult.success(wlanConfigService.getConfig());
+    public ApiResult<CommonPage<SasSystemWlanConfig>> page(NetworkConfigPageRequest request) {
+        return ApiResult.success(wlanConfigService.page(request));
     }
 
     /**

service-sas/service-sas-biz/src/main/java/com/usky/sas/domain/SasSystemConfig.java

@@ -28,9 +28,9 @@ public class SasSystemConfig implements Serializable {
     private String owlAgentHost;
 
     /**
-     * 服务器地址
+     * 系统服务器地址
      */
-    private String systesasHost;
+    private String systemHost;
 
     /**
      * 视频服务器地址

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/SasSystemWlanConfigService.java

@@ -1,7 +1,9 @@
 package com.usky.sas.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.sas.domain.SasSystemWlanConfig;
+import com.usky.sas.service.vo.NetworkConfigPageRequest;
 
 /**
  * 网络配置 服务接口
@@ -9,7 +11,12 @@ import com.usky.sas.domain.SasSystemWlanConfig;
 public interface SasSystemWlanConfigService extends CrudService<SasSystemWlanConfig> {
 
     /**
-     * 查询网络配置（单条）
+     * 分页查询网络配置
+     */
+    CommonPage<SasSystemWlanConfig> page(NetworkConfigPageRequest request);
+
+    /**
+     * 查询网络配置（单条，用于编辑等场景）
      */
     SasSystemWlanConfig getConfig();
 

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/impl/SasHomepageServiceImpl.java

@@ -157,5 +157,4 @@ public class SasHomepageServiceImpl implements SasHomepageService {
         item.setScene(e.getScene());
         return item;
     }
-}
-
+}

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/impl/SasSystemWlanConfigServiceImpl.java

@@ -1,10 +1,14 @@
 package com.usky.sas.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.sas.domain.SasSystemWlanConfig;
 import com.usky.sas.mapper.SasSystemWlanConfigMapper;
 import com.usky.sas.service.SasSystemWlanConfigService;
+import com.usky.sas.service.vo.NetworkConfigPageRequest;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -16,6 +20,24 @@ import java.time.LocalDateTime;
 public class SasSystemWlanConfigServiceImpl extends AbstractCrudService<SasSystemWlanConfigMapper, SasSystemWlanConfig>
         implements SasSystemWlanConfigService {
 
+    @Override
+    public CommonPage<SasSystemWlanConfig> page(NetworkConfigPageRequest request) {
+        IPage<SasSystemWlanConfig> page = new Page<>(request.getCurrent(), request.getSize());
+        LambdaQueryWrapper<SasSystemWlanConfig> wrapper = new LambdaQueryWrapper<>();
+        if (request.getName() != null && !request.getName().isEmpty()) {
+            wrapper.like(SasSystemWlanConfig::getName, request.getName());
+        }
+        if (request.getIpAddr() != null && !request.getIpAddr().isEmpty()) {
+            wrapper.like(SasSystemWlanConfig::getIpAddr, request.getIpAddr());
+        }
+        if (request.getStatus() != null) {
+            wrapper.eq(SasSystemWlanConfig::getStatus, request.getStatus());
+        }
+        wrapper.orderByDesc(SasSystemWlanConfig::getUpdateTime);
+        page = this.page(page, wrapper);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
+    }
+
     @Override
     public SasSystemWlanConfig getConfig() {
         LambdaQueryWrapper<SasSystemWlanConfig> wrapper = new LambdaQueryWrapper<>();

service-sas/service-sas-biz/src/main/java/com/usky/sas/service/vo/NetworkConfigPageRequest.java

@@ -0,0 +1,29 @@
+package com.usky.sas.service.vo;
+
+import lombok.Data;
+
+/**
+ * 网络配置分页查询请求
+ */
+@Data
+public class NetworkConfigPageRequest {
+
+    private Integer current = 1;
+
+    private Integer size = 10;
+
+    /**
+     * 网络名称（模糊）
+     */
+    private String name;
+
+    /**
+     * IP 地址（模糊）
+     */
+    private String ipAddr;
+
+    /**
+     * 状态：true 启用 false 未启用
+     */
+    private Boolean status;
+}

service-sas/service-sas-biz/src/main/resources/mapper/sas/SasSystemConfigMapper.xml

@@ -5,7 +5,7 @@
     <resultMap id="BaseResultMap" type="com.usky.sas.domain.SasSystemConfig">
         <id column="id" property="id"/>
         <result column="owl_agent_host" property="owlAgentHost"/>
-        <result column="systesas_host" property="systesasHost"/>
+        <result column="system_host" property="systemHost"/>
         <result column="video_server_host" property="videoServerHost"/>
         <result column="gateway_name" property="gatewayName"/>
         <result column="days_to_keep_history" property="daysToKeepHistory"/>