diff --git a/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java b/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java index 5277229..8e94d38 100644 --- a/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java +++ b/src/main/java/com/glxp/udi/admin/controller/info/PlatformController.java @@ -2,6 +2,7 @@ package com.glxp.udi.admin.controller.info; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -57,7 +58,7 @@ public class PlatformController { @AuthRuleAnnotation("") @GetMapping("/udims/platform/list") public BaseResponse list(@RequestParam Map params) { - Page page = platformService.list(params); + IPage page = platformService.list(params); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java index 77bd409..47d538a 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java @@ -16,10 +16,6 @@ public interface SystemParamConfigDao extends BaseMapper list(Map map) { - Page pageParam = new Page<>(-1, -1); + public IPage list(Map map) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(String.valueOf(map.get("id"))), "id", map.get("id")) + .like(StrUtil.isNotBlank(String.valueOf(map.get("name"))), "name", map.get("name")) + .like(StrUtil.isNotBlank(String.valueOf(map.get("host"))), "host", map.get("host")); + if (map.get("page") != null && map.get("limit") != null) { Integer page = Integer.valueOf(map.get("page").toString()); Integer limit = Integer.valueOf(map.get("limit").toString()); - pageParam = new Page<>(page, limit); + IPage pageParam = new Page<>(page, limit); + return platformDao.selectPage(pageParam, wrapper); + } else { + List list = platformDao.selectList(wrapper); + IPage pageResult = new Page<>(); + pageResult.setTotal(list.size()); + pageResult.setRecords(list); + return pageResult; } - return platformDao.list(pageParam, map); } public int count(Map map) { diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java index 061293f..19880d8 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao; import com.glxp.udi.admin.dao.param.SystemParamConfigDao; import com.glxp.udi.admin.entity.param.SystemParamConfigEntity; @@ -23,7 +24,7 @@ public class SystemParamConfigService { private SystemParamConfigCustomerDao systemParamConfigCustomerDao; public SystemParamConfigEntity selectByParamKey(String key) { - return systemParamConfigDao.selectByParamKey(key); + return systemParamConfigDao.selectOne(new QueryWrapper().eq("paramKey", key)); } public boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { @@ -45,7 +46,7 @@ public class SystemParamConfigService { for (String paramKey : systemParams) { //判断用户是否已经添加过此参数配置 if (systemParamConfigCustomerDao.countByCustomerId(paramKey, customerId) == 0) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigDao.selectByParamKey(paramKey); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigDao.selectOne(new QueryWrapper().eq("paramKey", paramKey)); list.add(systemParamConfigEntity); } } diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java index d48d307..5602f96 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.service.param; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.SystemParamConstant; @@ -72,7 +73,7 @@ public class SystemParamCustomerConfigService { //查询用户参数表,若用户有自定义此参数,则使用用户自己定义的参数,没有则使用默认参数 SystemParamConfigCustomerEntity systemParamConfigCustomer = systemParamConfigCustomerDao.selectByParamKeyAndCustomerId(paramKey, customerId); if (null == systemParamConfigCustomer) { - return systemParamConfigDao.selectByParamKey(paramKey); + return systemParamConfigDao.selectOne(new QueryWrapper().eq("paramKey", paramKey)); } else { SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); BeanUtil.copyProperties(systemParamConfigCustomer, systemParamConfigEntity); diff --git a/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml index 04ec82a..1e4a545 100644 --- a/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml +++ b/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml @@ -14,11 +14,6 @@ SELECT * FROM system_param_config WHERE paramName=#{paramName} - - UPDATE system_param_config