fix: 修复系统参数分页问题

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java

@@ -37,7 +37,8 @@ public class LimitRegionalController {
     @PostMapping
     @Log("新增流量限制")
     public ResponseEntity<Object> add(@RequestBody JSONObject json) {
-        return new ResponseEntity<>(limitRegionalService.add(json), HttpStatus.OK);
+        limitRegionalService.add(json);
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java

@@ -35,7 +35,7 @@ public interface LimitRegionalService extends CommonService<LimitRegional> {
      * @param json
      * @return
      */
-    List<LimitRegional> add(JSONObject json);
+    void add(JSONObject json);
 
 
     /**

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java

@@ -80,11 +80,9 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
 
 
     @Override
-    public List<LimitRegional> add(JSONObject json) {
+    public void add(JSONObject json) {
-        TreeSet<Integer> integers = deviceAppService.selectRegion();
-        integers.remove(0);
         LimitRegional limitRegional = new LimitRegional();
-        limitRegional.setId(RandomUtil.randomString(8));
+        limitRegional.setId(String.valueOf(RandomUtil.randomInt(8)));
         limitRegional.setStart_regional(json.getString("start_regional"));
         limitRegional.setNext_regional(json.getString("next_regional"));
         limitRegional.setStart_exclude_device(json.getString("startExcludeDevice"));
@@ -99,7 +97,6 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
         limitRegional.setCreate_by("auto");
         limitRegional.setCreate_time(DateUtil.now());
         limitRegionalMapper.insert(limitRegional);
-        return null;
     }
 
 
@@ -123,7 +120,13 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
         limitRegional.setNext_regional(json.getString("next_regional"));
         limitRegional.setStart_exclude_device(json.getString("startExcludeDevice"));
         limitRegional.setNext_exclude_device(json.getString("nextExcludeDevice"));
-        limitRegional.setMax_num(json.getString("max_num"));
+        String max_num = json.getString("max_num");
+        String regex = "\\d+";
+        boolean isNumeric = max_num.matches(regex);
+        if(!isNumeric){
+            throw new RuntimeException("最大数请输入纯数字");
+        }
+        limitRegional.setMax_num(max_num);
         limitRegional.setUpdate_by(currentUsername);
         limitRegional.setUpdate_time(DateUtil.now());
         limitRegionalMapper.updateById(limitRegional);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java

@@ -10,6 +10,7 @@ import org.nl.common.logging.annotation.Log;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -39,7 +40,7 @@ class SysParamController {
     @Log("查询系统参数")
     
     //@SaCheckPermission("param:list")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
         return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK);
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/ISysParamService.java

@@ -1,9 +1,11 @@
 package org.nl.system.service.param;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.system.service.param.dao.Param;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Map;
@@ -25,7 +27,7 @@ public interface ISysParamService extends IService<Param> {
      * @param page      分页信息
      * @return
      */
-    Page<Param> queryPage(Map whereJson, PageQuery page);
+    IPage<Param> queryPage(Map whereJson, Pageable page);
 
     /**
      * 创建参数

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java

@@ -5,9 +5,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.task.domain.Task;
+import org.nl.acs.utils.PageUtil;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
@@ -17,6 +20,7 @@ import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
 import org.nl.system.service.param.dao.mapper.SysParamMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,11 +43,12 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
     private SysParamMapper paramMapper;
 
     @Override
-    public Page<Param> queryPage(Map whereJson, PageQuery page) {
+    public IPage<Param> queryPage(Map whereJson, Pageable page) {
         QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderBy(true, true, "create_time");
-        Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);
+        IPage<Param> queryPage = PageUtil.toMybatisPage(page);
-        return paramPage;
+        IPage<Param> paramIPage = paramMapper.selectPage(queryPage, queryWrapper);
+        return paramIPage;
     }
 
     @Override