This commit is contained in:
TinyAnts 2022-03-25 19:01:17 +08:00
parent bb085118c4
commit 6f83ad86da
18 changed files with 150 additions and 25 deletions

View File

@ -5,7 +5,7 @@
<!-- 父工程 -->
<parent>
<artifactId>like-framework</artifactId>
<artifactId>likeadmin-java</artifactId>
<groupId>org.hxkj</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

View File

@ -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<SysAdminListVo> list = iSysAdminService.lists(pageParam);
public Object lists(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<SysAdminListVo> list = iSysAdminService.lists(pageParam, params);
return AjaxResult.success(list);
}

View File

@ -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<SysAdmin> {
import java.util.Map;
public interface ISysAdminService extends BaseService<SysAdmin> {
/**
* 获取管理员列表
@ -16,7 +19,7 @@ public interface ISysAdminService extends IService<SysAdmin> {
* @param pageParam 分页参数
* @return PageResult<SysAdminListVo>
*/
PageResult<SysAdminListVo> lists(PageParam pageParam);
PageResult<SysAdminListVo> lists(PageParam pageParam, Map<String, String> params);
/**
* 获取管理员详情

View File

@ -36,7 +36,7 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl<SysAdminMapper, Sys
* @return PageResult<SysAdminListVo>
*/
@Override
public PageResult<SysAdminListVo> lists(PageParam pageParam) {
public PageResult<SysAdminListVo> lists(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
@ -49,6 +49,12 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl<SysAdminMapper, Sys
.eq("is_delete", 0)
.orderByDesc("sort");
this.setSearch(queryWrapper, params, new String[]{
"eq:username"
});
// String[] a = {"str:username:=", ""};
IPage<SysAdmin> iPage = this.page(new Page<>(page, limit), queryWrapper);
List<SysAdminListVo> adminVoArrayList = new ArrayList<>();
@ -187,7 +193,7 @@ public class ISysAdminServiceImpl extends MPJBaseServiceImpl<SysAdminMapper, Sys
SysAdmin model = new SysAdmin();
model.setId(id);
model.setIsDelete(true);
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
this.updateById(model);
}

View File

@ -131,7 +131,7 @@ public class ISysMenuServiceImpl extends MPJBaseServiceImpl<SysMenuMapper, SysMe
Assert.notNull(model, "菜单已不存在!");
model.setId(id);
model.setIsDelete(true);
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
this.updateById(model);
}

View File

@ -171,7 +171,7 @@ public class ISysRoleServiceImpl extends MPJBaseServiceImpl<SysRoleMapper, SysRo
Assert.notNull(sysRole, "角色已不存在!");
sysRole.setId(id);
sysRole.setIsDelete(true);
sysRole.setIsDelete(1);
sysRole.setDeleteTime(System.currentTimeMillis() / 1000);
this.updateById(sysRole);
}

View File

@ -1,21 +1,29 @@
package com.hxkj.admin.validate;
import com.hxkj.common.validator.annotation.IDMust;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* 系统管理员参数
*/
@Data
public class SysAdminParam {
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SysAdminParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
@IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class})
private Integer id;
@ -36,7 +44,7 @@ public class SysAdminParam {
private String password;
@NotNull(message = "请选择状态", groups = {create.class, update.class})
private Boolean isDisable;
private Integer isDisable;
@NotNull(message = "排序号不能为空", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "排序号值不能少于0", groups = {create.class, update.class})

View File

@ -45,6 +45,6 @@ public class SysMenuParam {
private String perms;
@NotNull(message = "请选择状态", groups = {create.class, update.class})
private Boolean isDisable;
private Integer isDisable;
}

View File

@ -30,7 +30,7 @@ public class SysRoleParam {
private Integer sort;
@NotNull(message = "请选择状态", groups = {create.class, update.class})
private Boolean isDisable;
private Integer isDisable;
private String menuIds = "";

View File

@ -6,7 +6,7 @@
<!-- 父工程 -->
<parent>
<groupId>org.hxkj</groupId>
<artifactId>like-framework</artifactId>
<artifactId>likeadmin-java</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

View File

@ -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<T> extends IService<T> {
default void setSearch(QueryWrapper<T> queryWrapper, Map<String, String> 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<Integer> intData = new ArrayList<>();
for (String v : value.split(",")) {
intData.add(Integer.parseInt(v.trim()));
}
val = intData;
break;
case "longList":
List<Long> 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;
}
}
}
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -39,6 +39,7 @@ public class ToolsUtil {
return null;
}
/**
* 返回随机字符串
*

View File

@ -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">
<parent>
<artifactId>like-framework</artifactId>
<artifactId>likeadmin-java</artifactId>
<groupId>org.hxkj</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

View File

@ -19,9 +19,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<java.version>17</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<mysql-connector.version>5.1.49</mysql-connector.version>
<mybatis-plus.version>3.4.3.1</mybatis-plus.version>
<mybatis-plus-join.version>1.2.2</mybatis-plus-join.version>