diff --git a/like-admin/pom.xml b/like-admin/pom.xml index 5c1eb930..a6e3311d 100644 --- a/like-admin/pom.xml +++ b/like-admin/pom.xml @@ -5,7 +5,7 @@ - like-framework + likeadmin-java org.hxkj 1.0-SNAPSHOT diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SysAdminController.java b/like-admin/src/main/java/com/hxkj/admin/controller/system/SysAdminController.java index 1695c128..9e67e091 100644 --- a/like-admin/src/main/java/com/hxkj/admin/controller/system/SysAdminController.java +++ b/like-admin/src/main/java/com/hxkj/admin/controller/system/SysAdminController.java @@ -12,6 +12,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; @RestController @RequestMapping("/api/system/admin") @@ -27,8 +28,9 @@ public class SysAdminController { * @return Object */ @GetMapping("/lists") - public Object lists(@Validated PageParam pageParam) { - PageResult list = iSysAdminService.lists(pageParam); + public Object lists(@Validated PageParam pageParam, + @RequestParam Map params) { + PageResult list = iSysAdminService.lists(pageParam, params); return AjaxResult.success(list); } diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISysAdminService.java b/like-admin/src/main/java/com/hxkj/admin/service/ISysAdminService.java index 3bbfcc16..c16eedbd 100644 --- a/like-admin/src/main/java/com/hxkj/admin/service/ISysAdminService.java +++ b/like-admin/src/main/java/com/hxkj/admin/service/ISysAdminService.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hxkj.admin.validate.PageParam; import com.hxkj.admin.validate.SysAdminParam; import com.hxkj.admin.vo.system.SysAdminListVo; +import com.hxkj.common.core.BaseService; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SysAdmin; -public interface ISysAdminService extends IService { +import java.util.Map; + +public interface ISysAdminService extends BaseService { /** * 获取管理员列表 @@ -16,7 +19,7 @@ public interface ISysAdminService extends IService { * @param pageParam 分页参数 * @return PageResult */ - PageResult lists(PageParam pageParam); + PageResult lists(PageParam pageParam, Map params); /** * 获取管理员详情 diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/ISysAdminServiceImpl.java b/like-admin/src/main/java/com/hxkj/admin/service/impl/ISysAdminServiceImpl.java index 2a90b80c..c28a0f09 100644 --- a/like-admin/src/main/java/com/hxkj/admin/service/impl/ISysAdminServiceImpl.java +++ b/like-admin/src/main/java/com/hxkj/admin/service/impl/ISysAdminServiceImpl.java @@ -36,7 +36,7 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl */ @Override - public PageResult lists(PageParam pageParam) { + public PageResult lists(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -49,6 +49,12 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl iPage = this.page(new Page<>(page, limit), queryWrapper); List adminVoArrayList = new ArrayList<>(); @@ -187,7 +193,7 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl org.hxkj - like-framework + likeadmin-java 1.0-SNAPSHOT diff --git a/like-common/src/main/java/com/hxkj/common/core/BaseService.java b/like-common/src/main/java/com/hxkj/common/core/BaseService.java new file mode 100644 index 00000000..a95436c6 --- /dev/null +++ b/like-common/src/main/java/com/hxkj/common/core/BaseService.java @@ -0,0 +1,105 @@ +package com.hxkj.common.core; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +public interface BaseService extends IService { + + default void setSearch(QueryWrapper queryWrapper, Map params, String[] conditions) { + + for (String condition : conditions) { + String[] array = condition.split(":"); + String type = array[0].trim(); + String where = array[2].trim(); + String[] arr = array[1].trim().split("@"); + String key = arr[0].trim(); + String field = arr.length > 1 ? arr[1].trim() : arr[0].trim(); + String value = params.getOrDefault(key, ""); + + if (value.equals("")) { + continue; + } + + Object val = value; + switch (type) { + case "int": + val = Integer.parseInt(value); + break; + case "long": + val = Long.parseLong(value); + break; + case "strList": + val = Arrays.asList(value.split(",")); + break; + case "intList": + List intData = new ArrayList<>(); + for (String v : value.split(",")) { + intData.add(Integer.parseInt(v.trim())); + } + val = intData; + break; + case "longList": + List longData = new ArrayList<>(); + for (String v : value.split(",")) { + longData.add(Long.parseLong(v.trim())); + } + val = longData; + break; + } + + switch (where) { + case "=": + queryWrapper.eq(field, val); + break; + case "<>": + queryWrapper.ne(field, val); + break; + case ">": + queryWrapper.gt(field, val); + break; + case ">=": + queryWrapper.ge(field, val); + break; + case "<": + queryWrapper.lt(field, val); + break; + case "<=": + queryWrapper.le(field, val); + break; + case "between": + String[] betArr = value.split(","); + queryWrapper.between(field, Integer.parseInt(betArr[0]), Integer.parseInt(betArr[1])); + break; + case "notBetween": + String[] notBetArr = value.split(","); + queryWrapper.notBetween(field, Integer.parseInt(notBetArr[0]), Integer.parseInt(notBetArr[1])); + break; + case "like": + queryWrapper.like(field, val); + break; + case "notLike": + queryWrapper.notLike(field, val); + break; + case "likeLeft": + queryWrapper.likeLeft(field, val); + break; + case "likeRight": + queryWrapper.likeRight(field, val); + break; + case "in": + queryWrapper.in(field, val); + break; + case "notIn": + queryWrapper.notIn(field, val); + break; + } + } + + } + +} diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SysAdmin.java b/like-common/src/main/java/com/hxkj/common/entity/system/SysAdmin.java index cc617936..112273f3 100644 --- a/like-common/src/main/java/com/hxkj/common/entity/system/SysAdmin.java +++ b/like-common/src/main/java/com/hxkj/common/entity/system/SysAdmin.java @@ -23,8 +23,8 @@ public class SysAdmin implements Serializable { private String salt; private Integer role; private Integer sort; - private Boolean isDisable; - private Boolean isDelete; + private Integer isDisable; + private Integer isDelete; private String lastLoginIp; private Long lastLoginTime; private Long createTime; diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SysMenu.java b/like-common/src/main/java/com/hxkj/common/entity/system/SysMenu.java index 7f9d04fd..df7e5013 100644 --- a/like-common/src/main/java/com/hxkj/common/entity/system/SysMenu.java +++ b/like-common/src/main/java/com/hxkj/common/entity/system/SysMenu.java @@ -22,8 +22,8 @@ public class SysMenu implements Serializable { private String menuIcon; private Integer menuSort; private String perms; - private Boolean isDisable; - private Boolean isDelete; + private Integer isDisable; + private Integer isDelete; private Long createTime; private Long updateTime; private Long deleteTime; diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SysRole.java b/like-common/src/main/java/com/hxkj/common/entity/system/SysRole.java index e585d1f2..b217daaf 100644 --- a/like-common/src/main/java/com/hxkj/common/entity/system/SysRole.java +++ b/like-common/src/main/java/com/hxkj/common/entity/system/SysRole.java @@ -20,8 +20,8 @@ public class SysRole implements Serializable { private String remark; private Integer sort; private String menuIds; - private Boolean isDisable; - private Boolean isDelete; + private Integer isDisable; + private Integer isDelete; private Long createTime; private Long updateTime; private Long deleteTime; diff --git a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java b/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java index 65d72c73..3030a743 100644 --- a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java +++ b/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java @@ -39,6 +39,7 @@ public class ToolsUtil { return null; } + /** * 返回随机字符串 * diff --git a/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java b/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java index 1a21601d..1cb8e43e 100644 --- a/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java +++ b/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java @@ -8,7 +8,7 @@ import javax.validation.ConstraintValidatorContext; /** * 验证主键ID参数 */ -public class IDMustValidator implements ConstraintValidator { +public class IDMustValidator implements ConstraintValidator { @Override public void initialize(IDMust constraintAnnotation) { diff --git a/like-front/pom.xml b/like-front/pom.xml index e9a89e43..1fdc846f 100644 --- a/like-front/pom.xml +++ b/like-front/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - like-framework + likeadmin-java org.hxkj 1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4c5e4c27..04e14e66 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ UTF-8 UTF-8 - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 5.1.49 3.4.3.1 1.2.2