diff --git a/pom.xml b/pom.xml index a849ad6c80f72c7215aaa137a6d3613ed3e44112..c398c9f7fc4b3bbdf92bb8fe5266ca1f0f4e6d63 100644 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,8 @@ commons-lang3 3.5 - - org.projectlombok - lombok - + com.fasterxml.jackson.core jackson-databind diff --git a/src/main/java/com/zw/admin/server/advice/ExceptionHandlerAdvice.java b/src/main/java/com/zw/admin/server/advice/ExceptionHandlerAdvice.java index c927db1017b47ec007f5f231edd801d7de86415d..7f69b87514e4c216627141f82dbd1a9a14b0336a 100644 --- a/src/main/java/com/zw/admin/server/advice/ExceptionHandlerAdvice.java +++ b/src/main/java/com/zw/admin/server/advice/ExceptionHandlerAdvice.java @@ -3,6 +3,8 @@ package com.zw.admin.server.advice; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authz.UnauthorizedException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.web.bind.MissingServletRequestParameterException; @@ -14,50 +16,48 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep import com.zw.admin.server.dto.ResponseInfo; -import lombok.extern.slf4j.Slf4j; - /** * springmvc异常处理 * * @author 小威老师 * */ -@Slf4j(topic = "adminLogger") + @RestControllerAdvice public class ExceptionHandlerAdvice { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @ExceptionHandler({ IllegalArgumentException.class }) @ResponseStatus(HttpStatus.BAD_REQUEST) public ResponseInfo badRequestException(IllegalArgumentException exception) { - return ResponseInfo.builder().code(HttpStatus.BAD_REQUEST.value() + "").message(exception.getMessage()).build(); + return new ResponseInfo(HttpStatus.BAD_REQUEST.value() + "", exception.getMessage()); } @ExceptionHandler({ UnknownAccountException.class, IncorrectCredentialsException.class }) @ResponseStatus(HttpStatus.UNAUTHORIZED) public ResponseInfo loginException(Exception exception) { - return ResponseInfo.builder().code(HttpStatus.UNAUTHORIZED.value() + "").message(exception.getMessage()) - .build(); + return new ResponseInfo(HttpStatus.UNAUTHORIZED.value() + "", exception.getMessage()); } @ExceptionHandler({ UnauthorizedException.class }) @ResponseStatus(HttpStatus.FORBIDDEN) public ResponseInfo forbidden(Exception exception) { - return ResponseInfo.builder().code(HttpStatus.FORBIDDEN.value() + "").message(exception.getMessage()).build(); + return new ResponseInfo(HttpStatus.FORBIDDEN.value() + "", exception.getMessage()); } @ExceptionHandler({ MissingServletRequestParameterException.class, HttpMessageNotReadableException.class, UnsatisfiedServletRequestParameterException.class, MethodArgumentTypeMismatchException.class }) @ResponseStatus(HttpStatus.BAD_REQUEST) public ResponseInfo badRequestException(Exception exception) { - return ResponseInfo.builder().code(HttpStatus.BAD_REQUEST.value() + "").message(exception.getMessage()).build(); + return new ResponseInfo(HttpStatus.BAD_REQUEST.value() + "", exception.getMessage()); } @ExceptionHandler(Throwable.class) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) public ResponseInfo exception(Throwable throwable) { log.error("系统异常", throwable); - return ResponseInfo.builder().code(HttpStatus.INTERNAL_SERVER_ERROR.value() + "") - .message(throwable.getMessage()).build(); + return new ResponseInfo(HttpStatus.INTERNAL_SERVER_ERROR.value() + "", throwable.getMessage()); } diff --git a/src/main/java/com/zw/admin/server/config/DruidConfig.java b/src/main/java/com/zw/admin/server/config/DruidConfig.java index d06c8bba02a8292fae0c42504e91e07c4a1dae41..0afe1d4d3db5eb6a15128ef8bcf1f1914cb99592 100644 --- a/src/main/java/com/zw/admin/server/config/DruidConfig.java +++ b/src/main/java/com/zw/admin/server/config/DruidConfig.java @@ -4,6 +4,8 @@ import java.sql.SQLException; import javax.sql.DataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; @@ -15,20 +17,18 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.StatViewServlet; import com.alibaba.druid.support.http.WebStatFilter; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; - /** * Druid数据源配置 * * @author 小威老师 * */ -@Slf4j(topic = "adminLogger") + @Configuration public class DruidConfig { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Bean public ServletRegistrationBean druidServlet() { log.info("init Druid Servlet Configuration "); @@ -61,9 +61,7 @@ public class DruidConfig { * */ @ConfigurationProperties(prefix = "spring.datasource") - @Getter - @Setter - class DataSourceProperties { + public class DataSourceProperties { private String url; private String username; private String password; @@ -83,6 +81,150 @@ public class DruidConfig { private String filters; private String connectionProperties; + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getDriverClassName() { + return driverClassName; + } + + public void setDriverClassName(String driverClassName) { + this.driverClassName = driverClassName; + } + + public int getInitialSize() { + return initialSize; + } + + public void setInitialSize(int initialSize) { + this.initialSize = initialSize; + } + + public int getMinIdle() { + return minIdle; + } + + public void setMinIdle(int minIdle) { + this.minIdle = minIdle; + } + + public int getMaxActive() { + return maxActive; + } + + public void setMaxActive(int maxActive) { + this.maxActive = maxActive; + } + + public int getMaxWait() { + return maxWait; + } + + public void setMaxWait(int maxWait) { + this.maxWait = maxWait; + } + + public int getTimeBetweenEvictionRunsMillis() { + return timeBetweenEvictionRunsMillis; + } + + public void setTimeBetweenEvictionRunsMillis(int timeBetweenEvictionRunsMillis) { + this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis; + } + + public int getMinEvictableIdleTimeMillis() { + return minEvictableIdleTimeMillis; + } + + public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) { + this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis; + } + + public String getValidationQuery() { + return validationQuery; + } + + public void setValidationQuery(String validationQuery) { + this.validationQuery = validationQuery; + } + + public boolean isTestWhileIdle() { + return testWhileIdle; + } + + public void setTestWhileIdle(boolean testWhileIdle) { + this.testWhileIdle = testWhileIdle; + } + + public boolean isTestOnBorrow() { + return testOnBorrow; + } + + public void setTestOnBorrow(boolean testOnBorrow) { + this.testOnBorrow = testOnBorrow; + } + + public boolean isTestOnReturn() { + return testOnReturn; + } + + public void setTestOnReturn(boolean testOnReturn) { + this.testOnReturn = testOnReturn; + } + + public boolean isPoolPreparedStatements() { + return poolPreparedStatements; + } + + public void setPoolPreparedStatements(boolean poolPreparedStatements) { + this.poolPreparedStatements = poolPreparedStatements; + } + + public int getMaxPoolPreparedStatementPerConnectionSize() { + return maxPoolPreparedStatementPerConnectionSize; + } + + public void setMaxPoolPreparedStatementPerConnectionSize(int maxPoolPreparedStatementPerConnectionSize) { + this.maxPoolPreparedStatementPerConnectionSize = maxPoolPreparedStatementPerConnectionSize; + } + + public String getFilters() { + return filters; + } + + public void setFilters(String filters) { + this.filters = filters; + } + + public String getConnectionProperties() { + return connectionProperties; + } + + public void setConnectionProperties(String connectionProperties) { + this.connectionProperties = connectionProperties; + } + @Bean @Primary public DataSource dataSource() { diff --git a/src/main/java/com/zw/admin/server/config/MyShiroRealm.java b/src/main/java/com/zw/admin/server/config/MyShiroRealm.java index 3db1c739a9edf0d2af8e73fa223edb1719aa7aae..c911efd82596b3b4369a0fbe8c23383e752d08fc 100644 --- a/src/main/java/com/zw/admin/server/config/MyShiroRealm.java +++ b/src/main/java/com/zw/admin/server/config/MyShiroRealm.java @@ -17,6 +17,8 @@ import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.util.ByteSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; import com.zw.admin.server.dao.PermissionDao; @@ -29,10 +31,12 @@ import com.zw.admin.server.service.UserService; import com.zw.admin.server.utils.SpringUtil; import com.zw.admin.server.utils.UserUtil; -import lombok.extern.slf4j.Slf4j; -@Slf4j(topic = "adminLogger") + + public class MyShiroRealm extends AuthorizingRealm { + + private static final Logger log = LoggerFactory.getLogger("adminLogger"); @Override protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { diff --git a/src/main/java/com/zw/admin/server/controller/FileController.java b/src/main/java/com/zw/admin/server/controller/FileController.java index 8898fed089e3d0e3c58452b9483bb3f42673ce9e..b052ac815254ecbdfdfcca61debff8a70ab0b05c 100644 --- a/src/main/java/com/zw/admin/server/controller/FileController.java +++ b/src/main/java/com/zw/admin/server/controller/FileController.java @@ -72,21 +72,21 @@ public class FileController { @GetMapping @ApiOperation(value = "文件查询") @RequiresPermissions("sys:file:query") - public PageTableResponse listFiles(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse listFiles(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return fileInfoDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { List list = fileInfoDao.list(request.getParams(), request.getOffset(), request.getLimit()); return list; } - }).build().handle(request); + }).handle(request); } @LogAnnotation diff --git a/src/main/java/com/zw/admin/server/controller/JobController.java b/src/main/java/com/zw/admin/server/controller/JobController.java index 5b29cf804507303d8e8c9d38750b73392e9b3fe8..e7bb7e31d5ef15fad82d9954ae4a7fb162811fc2 100644 --- a/src/main/java/com/zw/admin/server/controller/JobController.java +++ b/src/main/java/com/zw/admin/server/controller/JobController.java @@ -87,21 +87,21 @@ public class JobController { @GetMapping @ApiOperation(value = "定时任务列表") @RequiresPermissions("job:query") - public PageTableResponse list(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse list(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return jobDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { List list = jobDao.list(request.getParams(), request.getOffset(), request.getLimit()); return list; } - }).build().handle(request); + }).handle(request); } @ApiOperation(value = "校验cron表达式") diff --git a/src/main/java/com/zw/admin/server/controller/MailController.java b/src/main/java/com/zw/admin/server/controller/MailController.java index 14efc193d22cd596ffd10a644c6aa6135d538e9c..eddda5d8b2e926d773c3e9d54f8915edcbef7897 100644 --- a/src/main/java/com/zw/admin/server/controller/MailController.java +++ b/src/main/java/com/zw/admin/server/controller/MailController.java @@ -76,20 +76,20 @@ public class MailController { @GetMapping @ApiOperation(value = "邮件列表") @RequiresPermissions("mail:all:query") - public PageTableResponse list(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse list(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return mailDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + },new ListHandler() { @Override public List list(PageTableRequest request) { return mailDao.list(request.getParams(), request.getOffset(), request.getLimit()); } - }).build().handle(request); + }).handle(request); } } diff --git a/src/main/java/com/zw/admin/server/controller/NoticeController.java b/src/main/java/com/zw/admin/server/controller/NoticeController.java index b44ed6cb4f605efeef076f3e1c7e191a8cce7b7d..f058912297c2d65a2138215f0629f08820f3b7cb 100644 --- a/src/main/java/com/zw/admin/server/controller/NoticeController.java +++ b/src/main/java/com/zw/admin/server/controller/NoticeController.java @@ -90,20 +90,20 @@ public class NoticeController { @GetMapping @ApiOperation(value = "公告管理列表") @RequiresPermissions("notice:query") - public PageTableResponse listNotice(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse listNotice(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return noticeDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { return noticeDao.list(request.getParams(), request.getOffset(), request.getLimit()); } - }).build().handle(request); + }).handle(request); } @LogAnnotation @@ -123,21 +123,21 @@ public class NoticeController { @GetMapping("/published") @ApiOperation(value = "公告列表") - public PageTableResponse listNoticeReadVO(PageTableRequest request) { + public PageTableResponse listNoticeReadVO(PageTableRequest request) { request.getParams().put("userId", UserUtil.getCurrentUser().getId()); - return PageTableHandler. builder().countHandler(new CountHandler() { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return noticeDao.countNotice(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { return noticeDao.listNotice(request.getParams(), request.getOffset(), request.getLimit()); } - }).build().handle(request); + }).handle(request); } } diff --git a/src/main/java/com/zw/admin/server/controller/RoleController.java b/src/main/java/com/zw/admin/server/controller/RoleController.java index 84ae5be9e604330c3f69323669582826d5798cde..131a9a21e7445f0544a87308fdc13617518f2fe7 100644 --- a/src/main/java/com/zw/admin/server/controller/RoleController.java +++ b/src/main/java/com/zw/admin/server/controller/RoleController.java @@ -55,21 +55,21 @@ public class RoleController { @GetMapping @ApiOperation(value = "角色列表") @RequiresPermissions("sys:role:query") - public PageTableResponse listRoles(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse listRoles(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return roleDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { List list = roleDao.list(request.getParams(), request.getOffset(), request.getLimit()); return list; } - }).build().handle(request); + }).handle(request); } @GetMapping("/{id}") diff --git a/src/main/java/com/zw/admin/server/controller/SysLogsController.java b/src/main/java/com/zw/admin/server/controller/SysLogsController.java index c31650b42053c7fefb22bbc38a8321ca8ede2c29..ecd8fa889d16b98fb583fb968b8d269afee26f21 100644 --- a/src/main/java/com/zw/admin/server/controller/SysLogsController.java +++ b/src/main/java/com/zw/admin/server/controller/SysLogsController.java @@ -30,20 +30,20 @@ public class SysLogsController { @GetMapping @RequiresPermissions(value = "sys:log:query") @ApiOperation(value = "日志列表") - public PageTableResponse list(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse list(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return sysLogsDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { return sysLogsDao.list(request.getParams(), request.getOffset(), request.getLimit()); } - }).build().handle(request); + }).handle(request); } } diff --git a/src/main/java/com/zw/admin/server/controller/UserController.java b/src/main/java/com/zw/admin/server/controller/UserController.java index db2ce29a76267b24a3ce35356e357716523a8270..d3000050ed97726bd047947d8f9e48be25c43a6a 100644 --- a/src/main/java/com/zw/admin/server/controller/UserController.java +++ b/src/main/java/com/zw/admin/server/controller/UserController.java @@ -3,6 +3,8 @@ package com.zw.admin.server.controller; import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,7 +29,6 @@ import com.zw.admin.server.utils.UserUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; /** * 用户相关接口 @@ -36,11 +37,13 @@ import lombok.extern.slf4j.Slf4j; * */ @Api(tags = "用户") -@Slf4j(topic = "adminLogger") + @RestController @RequestMapping("/users") public class UserController { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private UserService userService; @Autowired @@ -91,21 +94,21 @@ public class UserController { @GetMapping @ApiOperation(value = "用户列表") @RequiresPermissions("sys:user:query") - public PageTableResponse listUsers(PageTableRequest request) { - return PageTableHandler. builder().countHandler(new CountHandler() { + public PageTableResponse listUsers(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return userDao.count(request.getParams()); } - }).listHandler(new ListHandler() { + }, new ListHandler() { @Override public List list(PageTableRequest request) { List list = userDao.list(request.getParams(), request.getOffset(), request.getLimit()); return list; } - }).build().handle(request); + }).handle(request); } @ApiOperation(value = "当前登录用户") diff --git a/src/main/java/com/zw/admin/server/dto/BeanField.java b/src/main/java/com/zw/admin/server/dto/BeanField.java index fb49f8700f4bc3a31bffea51e3e32123cdbe6832..44414eb7d50f4d9d0bc64f033fd44c1f812e6de9 100644 --- a/src/main/java/com/zw/admin/server/dto/BeanField.java +++ b/src/main/java/com/zw/admin/server/dto/BeanField.java @@ -2,11 +2,6 @@ package com.zw.admin.server.dto; import java.io.Serializable; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class BeanField implements Serializable { private static final long serialVersionUID = 4279960350136806659L; @@ -22,4 +17,53 @@ public class BeanField implements Serializable { private String name; private String type; + + public String getColumnName() { + return columnName; + } + + public void setColumnName(String columnName) { + this.columnName = columnName; + } + + public String getColumnType() { + return columnType; + } + + public void setColumnType(String columnType) { + this.columnType = columnType; + } + + public String getColumnComment() { + return columnComment; + } + + public void setColumnComment(String columnComment) { + this.columnComment = columnComment; + } + + public String getColumnDefault() { + return columnDefault; + } + + public void setColumnDefault(String columnDefault) { + this.columnDefault = columnDefault; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + } diff --git a/src/main/java/com/zw/admin/server/dto/GenerateDetail.java b/src/main/java/com/zw/admin/server/dto/GenerateDetail.java index 6d6b4b8e2e4615b57f93841ae83d1ff2ba366266..f57177b7826f846e4dd77800b4418345012d5a2c 100644 --- a/src/main/java/com/zw/admin/server/dto/GenerateDetail.java +++ b/src/main/java/com/zw/admin/server/dto/GenerateDetail.java @@ -3,11 +3,6 @@ package com.zw.admin.server.dto; import java.io.Serializable; import java.util.List; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class GenerateDetail implements Serializable { private static final long serialVersionUID = -164567294469931676L; @@ -15,4 +10,20 @@ public class GenerateDetail implements Serializable { private String beanName; private List fields; + + public String getBeanName() { + return beanName; + } + + public void setBeanName(String beanName) { + this.beanName = beanName; + } + + public List getFields() { + return fields; + } + + public void setFields(List fields) { + this.fields = fields; + } } diff --git a/src/main/java/com/zw/admin/server/dto/GenerateInput.java b/src/main/java/com/zw/admin/server/dto/GenerateInput.java index f6914258bc7e31d45b6af7b98b1b93cbddc0155e..b5ced569c3bd6ed8a433debba8d1b0c6d4f117bf 100644 --- a/src/main/java/com/zw/admin/server/dto/GenerateInput.java +++ b/src/main/java/com/zw/admin/server/dto/GenerateInput.java @@ -3,11 +3,6 @@ package com.zw.admin.server.dto; import java.io.Serializable; import java.util.List; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class GenerateInput implements Serializable { private static final long serialVersionUID = -2870071259702969061L; @@ -61,4 +56,100 @@ public class GenerateInput implements Serializable { * 默认值 */ private List beanFieldValue; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getBeanPackageName() { + return beanPackageName; + } + + public void setBeanPackageName(String beanPackageName) { + this.beanPackageName = beanPackageName; + } + + public String getBeanName() { + return beanName; + } + + public void setBeanName(String beanName) { + this.beanName = beanName; + } + + public String getDaoPackageName() { + return daoPackageName; + } + + public void setDaoPackageName(String daoPackageName) { + this.daoPackageName = daoPackageName; + } + + public String getDaoName() { + return daoName; + } + + public void setDaoName(String daoName) { + this.daoName = daoName; + } + + public String getControllerPkgName() { + return controllerPkgName; + } + + public void setControllerPkgName(String controllerPkgName) { + this.controllerPkgName = controllerPkgName; + } + + public String getControllerName() { + return controllerName; + } + + public void setControllerName(String controllerName) { + this.controllerName = controllerName; + } + + public List getColumnNames() { + return columnNames; + } + + public void setColumnNames(List columnNames) { + this.columnNames = columnNames; + } + + public List getBeanFieldName() { + return beanFieldName; + } + + public void setBeanFieldName(List beanFieldName) { + this.beanFieldName = beanFieldName; + } + + public List getBeanFieldType() { + return beanFieldType; + } + + public void setBeanFieldType(List beanFieldType) { + this.beanFieldType = beanFieldType; + } + + public List getBeanFieldValue() { + return beanFieldValue; + } + + public void setBeanFieldValue(List beanFieldValue) { + this.beanFieldValue = beanFieldValue; + } } diff --git a/src/main/java/com/zw/admin/server/dto/LayuiFile.java b/src/main/java/com/zw/admin/server/dto/LayuiFile.java index c2b88ecef82981d731538b0d288023f99269c465..7e6f4fc678c943086732804c7dd30ea41485e03b 100644 --- a/src/main/java/com/zw/admin/server/dto/LayuiFile.java +++ b/src/main/java/com/zw/admin/server/dto/LayuiFile.java @@ -2,11 +2,6 @@ package com.zw.admin.server.dto; import java.io.Serializable; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class LayuiFile implements Serializable { private static final long serialVersionUID = 35435494737590569L; @@ -15,12 +10,50 @@ public class LayuiFile implements Serializable { private String msg; private LayuiFileData data; - @Getter - @Setter + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public LayuiFileData getData() { + return data; + } + + public void setData(LayuiFileData data) { + this.data = data; + } + public static class LayuiFileData implements Serializable { private static final long serialVersionUID = 7907356434695924597L; private String src; private String title; + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } } } diff --git a/src/main/java/com/zw/admin/server/dto/NoticeReadVO.java b/src/main/java/com/zw/admin/server/dto/NoticeReadVO.java index ffae09f152af70b1f6af9bf9da2f8284557ab505..33b9e207159b4ec4e85c32aac796b6d7f49b1214 100644 --- a/src/main/java/com/zw/admin/server/dto/NoticeReadVO.java +++ b/src/main/java/com/zw/admin/server/dto/NoticeReadVO.java @@ -4,11 +4,6 @@ import java.util.Date; import com.zw.admin.server.model.Notice; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter public class NoticeReadVO extends Notice { private static final long serialVersionUID = -3842182350180882396L; @@ -16,4 +11,28 @@ public class NoticeReadVO extends Notice { private Long userId; private Date readTime; private Boolean isRead; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Date getReadTime() { + return readTime; + } + + public void setReadTime(Date readTime) { + this.readTime = readTime; + } + + public Boolean getIsRead() { + return isRead; + } + + public void setIsRead(Boolean isRead) { + this.isRead = isRead; + } } diff --git a/src/main/java/com/zw/admin/server/dto/NoticeVO.java b/src/main/java/com/zw/admin/server/dto/NoticeVO.java index 806f446057115b9b54c3d611d6bf59d1b836df60..0907eb5018d9bf48040e622f0d5817298c76b5f4 100644 --- a/src/main/java/com/zw/admin/server/dto/NoticeVO.java +++ b/src/main/java/com/zw/admin/server/dto/NoticeVO.java @@ -6,11 +6,6 @@ import java.util.List; import com.zw.admin.server.model.Notice; import com.zw.admin.server.model.User; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class NoticeVO implements Serializable { private static final long serialVersionUID = 7363353918096951799L; @@ -18,4 +13,20 @@ public class NoticeVO implements Serializable { private Notice notice; private List users; + + public Notice getNotice() { + return notice; + } + + public void setNotice(Notice notice) { + this.notice = notice; + } + + public List getUsers() { + return users; + } + + public void setUsers(List users) { + this.users = users; + } } diff --git a/src/main/java/com/zw/admin/server/dto/ResponseInfo.java b/src/main/java/com/zw/admin/server/dto/ResponseInfo.java index 384a4031a13d05bcdf2b24b55196fcfd2f7a9e35..2e786565e52a97ab60594d63a488d1c96018800b 100644 --- a/src/main/java/com/zw/admin/server/dto/ResponseInfo.java +++ b/src/main/java/com/zw/admin/server/dto/ResponseInfo.java @@ -2,17 +2,33 @@ package com.zw.admin.server.dto; import java.io.Serializable; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@Builder public class ResponseInfo implements Serializable { private static final long serialVersionUID = -4417715614021482064L; private String code; private String message; + + public ResponseInfo(String code, String message) { + super(); + this.code = code; + this.message = message; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + } diff --git a/src/main/java/com/zw/admin/server/dto/RoleDto.java b/src/main/java/com/zw/admin/server/dto/RoleDto.java index 1bf0199b0209604d3b969355eebe155208f3ebe2..0d318136e7f97e873caf9cd8e71bb894d38da4b2 100644 --- a/src/main/java/com/zw/admin/server/dto/RoleDto.java +++ b/src/main/java/com/zw/admin/server/dto/RoleDto.java @@ -4,14 +4,17 @@ import java.util.List; import com.zw.admin.server.model.Role; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class RoleDto extends Role { private static final long serialVersionUID = 4218495592167610193L; private List permissionIds; + + public List getPermissionIds() { + return permissionIds; + } + + public void setPermissionIds(List permissionIds) { + this.permissionIds = permissionIds; + } } diff --git a/src/main/java/com/zw/admin/server/dto/Token.java b/src/main/java/com/zw/admin/server/dto/Token.java index 8a93d9a19e593c6e57b593a92d7cf5c54ac1ef96..347f12e146f17537af4065efd4004d33d8fc453f 100644 --- a/src/main/java/com/zw/admin/server/dto/Token.java +++ b/src/main/java/com/zw/admin/server/dto/Token.java @@ -3,10 +3,6 @@ package com.zw.admin.server.dto; import java.io.Serializable; import java.util.Date; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - /** * Restful方式登陆token * @@ -14,9 +10,7 @@ import lombok.Setter; * * 2017年8月4日 */ -@Getter -@Setter -@Builder + public class Token implements Serializable { private static final long serialVersionUID = 4043470238789599973L; @@ -28,4 +22,26 @@ public class Token implements Serializable { */ private Date expireTime; + public Token(String token, Date expireTime) { + super(); + this.token = token; + this.expireTime = expireTime; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public Date getExpireTime() { + return expireTime; + } + + public void setExpireTime(Date expireTime) { + this.expireTime = expireTime; + } + } diff --git a/src/main/java/com/zw/admin/server/dto/UserDto.java b/src/main/java/com/zw/admin/server/dto/UserDto.java index 4be6efaa3478167e650265189e94d6e24e04f0a2..5f206db167fb5d2b45ce766e2e14fb2669268c82 100644 --- a/src/main/java/com/zw/admin/server/dto/UserDto.java +++ b/src/main/java/com/zw/admin/server/dto/UserDto.java @@ -4,15 +4,18 @@ import java.util.List; import com.zw.admin.server.model.User; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class UserDto extends User { private static final long serialVersionUID = -184009306207076712L; private List roleIds; + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + } diff --git a/src/main/java/com/zw/admin/server/filter/LogoutFilter.java b/src/main/java/com/zw/admin/server/filter/LogoutFilter.java index 09981cc1c4fe6fc5b87f66363b01684ea0efc12b..0532ebf0de1381bd3b9cb0ff49566dc92cda067e 100644 --- a/src/main/java/com/zw/admin/server/filter/LogoutFilter.java +++ b/src/main/java/com/zw/admin/server/filter/LogoutFilter.java @@ -5,6 +5,8 @@ import javax.servlet.ServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.web.util.WebUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import com.alibaba.fastjson.JSONObject; @@ -15,8 +17,6 @@ import com.zw.admin.server.service.TokenManager; import com.zw.admin.server.utils.SpringUtil; import com.zw.admin.server.utils.UserUtil; -import lombok.extern.slf4j.Slf4j; - /** * 退出
* web退出和restful方式退出
@@ -26,9 +26,10 @@ import lombok.extern.slf4j.Slf4j; * * 2017年8月13日 */ -@Slf4j(topic = "adminLogger") public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Override protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { String loginToken = RestfulFilter.getToken(request); @@ -55,9 +56,8 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter } } - private static String SUCCESS_INFO = JSONObject - .toJSONString(ResponseInfo.builder().code(HttpStatus.OK.value() + "").message("退出成功").build()); - private static String ERR_INFO = JSONObject.toJSONString( - ResponseInfo.builder().code(HttpStatus.BAD_REQUEST.value() + "").message("退出失败,token不存在").build()); + private static String SUCCESS_INFO = JSONObject.toJSONString(new ResponseInfo(HttpStatus.OK.value() + "", "退出成功")); + private static String ERR_INFO = JSONObject + .toJSONString(new ResponseInfo(HttpStatus.BAD_REQUEST.value() + "", "退出失败,token不存在")); } diff --git a/src/main/java/com/zw/admin/server/filter/RestfulFilter.java b/src/main/java/com/zw/admin/server/filter/RestfulFilter.java index 2e89622fda5a8e5c9a2285d1bfa01f7c27600dd8..248b26d8153e772ab3cfc5aec3595e6a3ed0820e 100644 --- a/src/main/java/com/zw/admin/server/filter/RestfulFilter.java +++ b/src/main/java/com/zw/admin/server/filter/RestfulFilter.java @@ -84,8 +84,8 @@ public class RestfulFilter extends UserFilter { return false; } - private static String info = JSONObject.toJSONString( - ResponseInfo.builder().code(HttpStatus.UNAUTHORIZED.value() + "").message("token不存在或者过期").build()); + private static String info = JSONObject + .toJSONString(new ResponseInfo(HttpStatus.UNAUTHORIZED.value() + "", "token不存在或者过期")); public static void writeResponse(HttpServletResponse response, int status, String json) { try { diff --git a/src/main/java/com/zw/admin/server/model/BaseEntity.java b/src/main/java/com/zw/admin/server/model/BaseEntity.java index cc11f8a1f25ee41f4ea967715466749562b0b90d..cb493d6b279a63a53f4298168228d3b7dcee8878 100644 --- a/src/main/java/com/zw/admin/server/model/BaseEntity.java +++ b/src/main/java/com/zw/admin/server/model/BaseEntity.java @@ -3,11 +3,6 @@ package com.zw.admin.server.model; import java.io.Serializable; import java.util.Date; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter public abstract class BaseEntity implements Serializable { private static final long serialVersionUID = 2054813493011812469L; @@ -15,4 +10,28 @@ public abstract class BaseEntity implements Serializabl private ID id; private Date createTime = new Date(); private Date updateTime = new Date(); + + public ID getId() { + return id; + } + + public void setId(ID id) { + this.id = id; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } } diff --git a/src/main/java/com/zw/admin/server/model/FileInfo.java b/src/main/java/com/zw/admin/server/model/FileInfo.java index fc2ba128aad50b3891c4887c58efb85eb6adf1ff..a63b252c043ac1dcca65acb099cb52d4998f0e7d 100644 --- a/src/main/java/com/zw/admin/server/model/FileInfo.java +++ b/src/main/java/com/zw/admin/server/model/FileInfo.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class FileInfo extends BaseEntity { private static final long serialVersionUID = -5761547882766615438L; @@ -14,4 +9,44 @@ public class FileInfo extends BaseEntity { private String path; private String url; private Integer type; + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } } diff --git a/src/main/java/com/zw/admin/server/model/JobModel.java b/src/main/java/com/zw/admin/server/model/JobModel.java index 66acee46940c89be9fa89507a0e2536eaec93801..868010f75ce61f7bd4ac00216802d53b33869af4 100644 --- a/src/main/java/com/zw/admin/server/model/JobModel.java +++ b/src/main/java/com/zw/admin/server/model/JobModel.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class JobModel extends BaseEntity { private static final long serialVersionUID = -2458935535811207209L; @@ -23,4 +18,60 @@ public class JobModel extends BaseEntity { private int status; + public String getJobName() { + return jobName; + } + + public void setJobName(String jobName) { + this.jobName = jobName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getCron() { + return cron; + } + + public void setCron(String cron) { + this.cron = cron; + } + + public String getSpringBeanName() { + return springBeanName; + } + + public void setSpringBeanName(String springBeanName) { + this.springBeanName = springBeanName; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + public Boolean getIsSysJob() { + return isSysJob; + } + + public void setIsSysJob(Boolean isSysJob) { + this.isSysJob = isSysJob; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + } diff --git a/src/main/java/com/zw/admin/server/model/Mail.java b/src/main/java/com/zw/admin/server/model/Mail.java index b605122da2236587219dfc7302ce77b6b98fb995..8cdf6636e66e603a79f90be1aeba05baa25ef2c1 100644 --- a/src/main/java/com/zw/admin/server/model/Mail.java +++ b/src/main/java/com/zw/admin/server/model/Mail.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class Mail extends BaseEntity { private static final long serialVersionUID = 5613231124043303948L; @@ -14,4 +9,36 @@ public class Mail extends BaseEntity { private String subject; private String content; + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getToUsers() { + return toUsers; + } + + public void setToUsers(String toUsers) { + this.toUsers = toUsers; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + } diff --git a/src/main/java/com/zw/admin/server/model/MailTo.java b/src/main/java/com/zw/admin/server/model/MailTo.java index 3321c574d172aa3d314f44a32227d1bbb0504ad4..fb32465a76274318a07a981c95cc02ff30f69d5e 100644 --- a/src/main/java/com/zw/admin/server/model/MailTo.java +++ b/src/main/java/com/zw/admin/server/model/MailTo.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class MailTo extends BaseEntity { private static final long serialVersionUID = -8238779033956731073L; @@ -12,4 +7,28 @@ public class MailTo extends BaseEntity { private Long mailId; private String toUser; private Boolean status; + + public Long getMailId() { + return mailId; + } + + public void setMailId(Long mailId) { + this.mailId = mailId; + } + + public String getToUser() { + return toUser; + } + + public void setToUser(String toUser) { + this.toUser = toUser; + } + + public Boolean getStatus() { + return status; + } + + public void setStatus(Boolean status) { + this.status = status; + } } diff --git a/src/main/java/com/zw/admin/server/model/Notice.java b/src/main/java/com/zw/admin/server/model/Notice.java index d33e39789a38dcab55c4e24ecdda16236e15eba9..729c3598582351d4fb928f60eb0f817a1adb14d6 100644 --- a/src/main/java/com/zw/admin/server/model/Notice.java +++ b/src/main/java/com/zw/admin/server/model/Notice.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class Notice extends BaseEntity { private static final long serialVersionUID = -4401913568806243090L; @@ -13,6 +8,30 @@ public class Notice extends BaseEntity { private String content; private Integer status; + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public interface Status { int DRAFT = 0; int PUBLISH = 1; diff --git a/src/main/java/com/zw/admin/server/model/Permission.java b/src/main/java/com/zw/admin/server/model/Permission.java index 867627560370c96b7f801e051adde29969920664..cd0e066535d1c6946f15335d634fe1a57c11b5f1 100644 --- a/src/main/java/com/zw/admin/server/model/Permission.java +++ b/src/main/java/com/zw/admin/server/model/Permission.java @@ -2,11 +2,6 @@ package com.zw.admin.server.model; import java.util.List; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class Permission extends BaseEntity { private static final long serialVersionUID = 6180869216498363919L; @@ -20,4 +15,68 @@ public class Permission extends BaseEntity { private Integer sort; private List child; + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCss() { + return css; + } + + public void setCss(String css) { + this.css = css; + } + + public String getHref() { + return href; + } + + public void setHref(String href) { + this.href = href; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getPermission() { + return permission; + } + + public void setPermission(String permission) { + this.permission = permission; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public List getChild() { + return child; + } + + public void setChild(List child) { + this.child = child; + } } diff --git a/src/main/java/com/zw/admin/server/model/Role.java b/src/main/java/com/zw/admin/server/model/Role.java index 151362c97d2ab1b4d940cf0b777b06965736089e..0c178eeda2a76c7d498666f6b162ca88562346d5 100644 --- a/src/main/java/com/zw/admin/server/model/Role.java +++ b/src/main/java/com/zw/admin/server/model/Role.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class Role extends BaseEntity { private static final long serialVersionUID = -3802292814767103648L; @@ -12,4 +7,20 @@ public class Role extends BaseEntity { private String name; private String description; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } diff --git a/src/main/java/com/zw/admin/server/model/SysLogs.java b/src/main/java/com/zw/admin/server/model/SysLogs.java index b9510178fc7c7c1ac790de8101f8ae5ce93f720d..9b4dd43bb8bc45a822c80b17632950aadbf68f27 100644 --- a/src/main/java/com/zw/admin/server/model/SysLogs.java +++ b/src/main/java/com/zw/admin/server/model/SysLogs.java @@ -1,10 +1,5 @@ package com.zw.admin.server.model; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class SysLogs extends BaseEntity { private static final long serialVersionUID = -7809315432127036583L; @@ -13,4 +8,36 @@ public class SysLogs extends BaseEntity { private Boolean flag; private String remark; + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public Boolean getFlag() { + return flag; + } + + public void setFlag(Boolean flag) { + this.flag = flag; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + } diff --git a/src/main/java/com/zw/admin/server/model/User.java b/src/main/java/com/zw/admin/server/model/User.java index 4cbc5fbea8ea37e9cb630639004db31df7db4ac6..44083c2a20bd1ec9eec624838eeaf0985e29223d 100644 --- a/src/main/java/com/zw/admin/server/model/User.java +++ b/src/main/java/com/zw/admin/server/model/User.java @@ -5,11 +5,6 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class User extends BaseEntity { private static final long serialVersionUID = -6525908145032868837L; @@ -28,6 +23,94 @@ public class User extends BaseEntity { private Integer sex; private Integer status; + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getSalt() { + return salt; + } + + public void setSalt(String salt) { + this.salt = salt; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getHeadImgUrl() { + return headImgUrl; + } + + public void setHeadImgUrl(String headImgUrl) { + this.headImgUrl = headImgUrl; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Date getBirthday() { + return birthday; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public interface Status { int DISABLED = 0; int VALID = 1; diff --git a/src/main/java/com/zw/admin/server/page/table/PageTableHandler.java b/src/main/java/com/zw/admin/server/page/table/PageTableHandler.java index 0d05e70216d7d2140ca1507e247b62b1f5ca4005..5212b8b2b27d3273e9d7b40160a0b12a4f75502a 100644 --- a/src/main/java/com/zw/admin/server/page/table/PageTableHandler.java +++ b/src/main/java/com/zw/admin/server/page/table/PageTableHandler.java @@ -3,23 +3,27 @@ package com.zw.admin.server.page.table; import java.util.ArrayList; import java.util.List; -import lombok.Builder; - /** * 分页查询处理器 * * @author 小威老师 * */ -@Builder -public class PageTableHandler { + +public class PageTableHandler { private CountHandler countHandler; - private ListHandler listHandler; + private ListHandler listHandler; + + public PageTableHandler(CountHandler countHandler, ListHandler listHandler) { + super(); + this.countHandler = countHandler; + this.listHandler = listHandler; + } - public PageTableResponse handle(PageTableRequest dtRequest) { + public PageTableResponse handle(PageTableRequest dtRequest) { int count = 0; - List list = null; + List list = null; count = this.countHandler.count(dtRequest); if (count > 0) { @@ -27,14 +31,14 @@ public class PageTableHandler { } if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); } - return PageTableResponse. builder().recordsTotal(count).recordsFiltered(count).data(list).build(); + return new PageTableResponse(count, count, list); } - public interface ListHandler { - List list(PageTableRequest request); + public interface ListHandler { + List list(PageTableRequest request); } public interface CountHandler { diff --git a/src/main/java/com/zw/admin/server/page/table/PageTableRequest.java b/src/main/java/com/zw/admin/server/page/table/PageTableRequest.java index 60945db83f351fe694055f396cb238217f85c408..5d12717ef1b2eb2079bc3c1ecd3f1d501eff5f32 100644 --- a/src/main/java/com/zw/admin/server/page/table/PageTableRequest.java +++ b/src/main/java/com/zw/admin/server/page/table/PageTableRequest.java @@ -3,17 +3,12 @@ package com.zw.admin.server.page.table; import java.io.Serializable; import java.util.Map; -import lombok.Getter; -import lombok.Setter; - /** * 分页查询参数 * * @author 小威老师 * */ -@Getter -@Setter public class PageTableRequest implements Serializable { private static final long serialVersionUID = 7328071045193618467L; @@ -21,4 +16,28 @@ public class PageTableRequest implements Serializable { private Integer offset; private Integer limit; private Map params; + + public Integer getOffset() { + return offset; + } + + public void setOffset(Integer offset) { + this.offset = offset; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } } diff --git a/src/main/java/com/zw/admin/server/page/table/PageTableResponse.java b/src/main/java/com/zw/admin/server/page/table/PageTableResponse.java index 671892db44fec1ce319dbf85c049234d2d7a2387..d1edc06cadc6c04bd0b61e05371800407cfd7015 100644 --- a/src/main/java/com/zw/admin/server/page/table/PageTableResponse.java +++ b/src/main/java/com/zw/admin/server/page/table/PageTableResponse.java @@ -3,25 +3,49 @@ package com.zw.admin.server.page.table; import java.io.Serializable; import java.util.List; -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - /** * 分页查询返回 * * @author 小威老师 * */ -@Getter -@Setter -@Builder -public class PageTableResponse implements Serializable { +public class PageTableResponse implements Serializable { private static final long serialVersionUID = 620421858510718076L; private Integer recordsTotal; private Integer recordsFiltered; - private List data; + private List data; + + public PageTableResponse(Integer recordsTotal, Integer recordsFiltered, List data) { + super(); + this.recordsTotal = recordsTotal; + this.recordsFiltered = recordsFiltered; + this.data = data; + } + + public Integer getRecordsTotal() { + return recordsTotal; + } + + public void setRecordsTotal(Integer recordsTotal) { + this.recordsTotal = recordsTotal; + } + + public Integer getRecordsFiltered() { + return recordsFiltered; + } + + public void setRecordsFiltered(Integer recordsFiltered) { + this.recordsFiltered = recordsFiltered; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } } \ No newline at end of file diff --git a/src/main/java/com/zw/admin/server/service/impl/EhCacheTokenManager.java b/src/main/java/com/zw/admin/server/service/impl/EhCacheTokenManager.java index 415ba823964152a9a3a72f0c571f13ee71c99e13..425cfb547ff0d0c9f9cd9046e47f5c8609be4eb0 100644 --- a/src/main/java/com/zw/admin/server/service/impl/EhCacheTokenManager.java +++ b/src/main/java/com/zw/admin/server/service/impl/EhCacheTokenManager.java @@ -46,7 +46,7 @@ public class EhCacheTokenManager implements TokenManager { element.setTimeToLive(expireSeconds); cache.put(element); - return Token.builder().token(key).expireTime(DateUtils.addSeconds(new Date(), expireSeconds)).build(); + return new Token(key, DateUtils.addSeconds(new Date(), expireSeconds)); } @Override diff --git a/src/main/java/com/zw/admin/server/service/impl/FileServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/FileServiceImpl.java index 4b68164ee4fafeccd76c1113f39d340ee3a1bf0d..e0597264e5198087f210a4ca97b31378ff885e7f 100644 --- a/src/main/java/com/zw/admin/server/service/impl/FileServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/FileServiceImpl.java @@ -2,6 +2,8 @@ package com.zw.admin.server.service.impl; import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -12,11 +14,10 @@ import com.zw.admin.server.model.FileInfo; import com.zw.admin.server.service.FileService; import com.zw.admin.server.utils.FileUtil; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class FileServiceImpl implements FileService { + + private static final Logger log = LoggerFactory.getLogger("adminLogger"); @Value("${files.path}") private String filesPath; diff --git a/src/main/java/com/zw/admin/server/service/impl/JobServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/JobServiceImpl.java index 0c586be2772050f0a73aa05b24f12812cced5028..c2f129e4562ffc514d40bd1df3c5826b58fffb90 100644 --- a/src/main/java/com/zw/admin/server/service/impl/JobServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/JobServiceImpl.java @@ -15,6 +15,8 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -25,12 +27,11 @@ import com.zw.admin.server.job.SpringBeanJob; import com.zw.admin.server.model.JobModel; import com.zw.admin.server.service.JobService; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class JobServiceImpl implements JobService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private Scheduler scheduler; @Autowired diff --git a/src/main/java/com/zw/admin/server/service/impl/MailServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/MailServiceImpl.java index 62b1508a2130a053721d0e489f357cb1606ca57e..15be72f5a2ce92e86d8c0a9f7b749ec1d729424d 100644 --- a/src/main/java/com/zw/admin/server/service/impl/MailServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/MailServiceImpl.java @@ -2,6 +2,8 @@ package com.zw.admin.server.service.impl; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -12,12 +14,11 @@ import com.zw.admin.server.service.MailService; import com.zw.admin.server.service.SendMailSevice; import com.zw.admin.server.utils.UserUtil; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class MailServiceImpl implements MailService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private SendMailSevice sendMailSevice; @Autowired diff --git a/src/main/java/com/zw/admin/server/service/impl/PermissionServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/PermissionServiceImpl.java index b86f9b6e7bc04b55398f7a3ffa39fc3036be5988..08af0c76a46a08e8872a4324d64ba89888f6870f 100644 --- a/src/main/java/com/zw/admin/server/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/PermissionServiceImpl.java @@ -1,5 +1,7 @@ package com.zw.admin.server.service.impl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -8,12 +10,11 @@ import com.zw.admin.server.dao.PermissionDao; import com.zw.admin.server.model.Permission; import com.zw.admin.server.service.PermissionService; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class PermissionServiceImpl implements PermissionService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private PermissionDao permissionDao; diff --git a/src/main/java/com/zw/admin/server/service/impl/RedisTokenManager.java b/src/main/java/com/zw/admin/server/service/impl/RedisTokenManager.java index 780f2d42cc9f83572a55b4ba0ada7ddf3d982137..55820e85c12b25fda305920cd1292226a0b0691c 100644 --- a/src/main/java/com/zw/admin/server/service/impl/RedisTokenManager.java +++ b/src/main/java/com/zw/admin/server/service/impl/RedisTokenManager.java @@ -42,7 +42,7 @@ public class RedisTokenManager implements TokenManager { redisTemplate.opsForValue().set(TOKEN_PREFIX + key, JSONObject.toJSONString(usernamePasswordToken), expireSeconds, TimeUnit.SECONDS); - return Token.builder().token(key).expireTime(DateUtils.addSeconds(new Date(), expireSeconds)).build(); + return new Token(key, DateUtils.addSeconds(new Date(), expireSeconds)); } @Override diff --git a/src/main/java/com/zw/admin/server/service/impl/RoleServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/RoleServiceImpl.java index f7066ad3eedb96cde8ba91484ab4f5e5d6d3ef24..7320b4ac149b757ac4f8d3ea6dd8ea86d67bfb53 100644 --- a/src/main/java/com/zw/admin/server/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/RoleServiceImpl.java @@ -2,6 +2,8 @@ package com.zw.admin.server.service.impl; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -12,12 +14,11 @@ import com.zw.admin.server.dto.RoleDto; import com.zw.admin.server.model.Role; import com.zw.admin.server.service.RoleService; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class RoleServiceImpl implements RoleService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private RoleDao roleDao; diff --git a/src/main/java/com/zw/admin/server/service/impl/SysLogServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/SysLogServiceImpl.java index caedf87af54e8ea3abfabd322cac99e2ba458665..e142391fbe3c28495374b11a763d21fded553769 100644 --- a/src/main/java/com/zw/admin/server/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/SysLogServiceImpl.java @@ -4,6 +4,8 @@ import java.util.Date; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -14,12 +16,11 @@ import com.zw.admin.server.model.User; import com.zw.admin.server.service.SysLogService; import com.zw.admin.server.utils.UserUtil; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class SysLogServiceImpl implements SysLogService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private SysLogsDao sysLogsDao; diff --git a/src/main/java/com/zw/admin/server/service/impl/UserServiceImpl.java b/src/main/java/com/zw/admin/server/service/impl/UserServiceImpl.java index 5f70552ffd5b790cb7238a10418710142e3758aa..1a5afc0e3c6648919fa241b9a4ee4c45873efec7 100644 --- a/src/main/java/com/zw/admin/server/service/impl/UserServiceImpl.java +++ b/src/main/java/com/zw/admin/server/service/impl/UserServiceImpl.java @@ -5,6 +5,8 @@ import java.util.UUID; import org.apache.commons.codec.digest.DigestUtils; import org.apache.shiro.crypto.hash.SimpleHash; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,12 +20,11 @@ import com.zw.admin.server.model.User.Status; import com.zw.admin.server.service.UserService; import com.zw.admin.server.utils.UserUtil; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") @Service public class UserServiceImpl implements UserService { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + @Autowired private UserDao userDao; diff --git a/src/main/java/com/zw/admin/server/utils/TemplateUtil.java b/src/main/java/com/zw/admin/server/utils/TemplateUtil.java index 64339930c4e31e568c3d4a05699ec61a8c082978..0844843053bacb906d7a05bd5af1ac2c08a3af10 100644 --- a/src/main/java/com/zw/admin/server/utils/TemplateUtil.java +++ b/src/main/java/com/zw/admin/server/utils/TemplateUtil.java @@ -6,14 +6,15 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.zw.admin.server.dto.GenerateInput; -import lombok.extern.slf4j.Slf4j; - -@Slf4j(topic = "adminLogger") public class TemplateUtil { + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + public static String getTemplete(String fileName) { return FileUtil.getText(TemplateUtil.class.getClassLoader().getResourceAsStream("generate/" + fileName)); } @@ -40,6 +41,7 @@ public class TemplateUtil { text = text.replace("{import}", imports); String filelds = getFields(beanFieldName, beanFieldType, beanFieldValue); text = text.replace("{filelds}", filelds); + text = text.replace("{getset}", getset(beanFieldName, beanFieldType)); FileUtil.saveTextFile(text, path + File.separator + getPackagePath(beanPackageName) + beanName + ".java"); log.debug("生成java model：{}模板", beanName); @@ -78,6 +80,33 @@ public class TemplateUtil { return buffer.toString(); } + private static String getset(List beanFieldName, List beanFieldType) { + StringBuffer buffer = new StringBuffer(); + int size = beanFieldName.size(); + for (int i = 0; i < size; i++) { + String name = beanFieldName.get(i); + if ("id".equals(name) || "createTime".equals(name) || "updateTime".equals(name)) { + continue; + } + + String type = beanFieldType.get(i); + buffer.append("\tpublic ").append(type).append(" get") + .append(StringUtils.substring(name, 0, 1).toUpperCase() + name.substring(1, name.length())) + .append("() {\n"); + buffer.append("\t\treturn ").append(name).append(";\n"); + buffer.append("\t}\n"); + buffer.append("\tpublic ").append(type).append(" set") + .append(StringUtils.substring(name, 0, 1).toUpperCase() + name.substring(1, name.length())) + .append("() {\n"); + buffer.append("\t\treturn ").append(name).append(";\n"); + buffer.append("\t}\n"); + // 默认值 + buffer.append(";\n"); + } + + return buffer.toString(); + } + public static void saveJavaDao(GenerateInput input) { String path = input.getPath(); String tableName = input.getTableName(); diff --git a/src/main/resources/generate/controller.txt b/src/main/resources/generate/controller.txt index c87ce549db4daef675efa4b30b9a24dd6b1af1ce..eb797677550913e29f1f4c9994097296105fe54d 100644 --- a/src/main/resources/generate/controller.txt +++ b/src/main/resources/generate/controller.txt @@ -53,20 +53,20 @@ public class {controllerName} { @GetMapping @ApiOperation(value = "列表") - public PageTableResponse<{beanName}> list(PageTableRequest request) { - return PageTableHandler.<{beanName}> builder().countHandler(new CountHandler() { + public PageTableResponse list(PageTableRequest request) { + return new PageTableHandler(new CountHandler() { @Override public int count(PageTableRequest request) { return {daoParamName}.count(request.getParams()); } - }).listHandler(new ListHandler<{beanName}>() { + }, new ListHandler() { @Override public List<{beanName}> list(PageTableRequest request) { return {daoParamName}.list(request.getParams(), request.getOffset(), request.getLimit()); } - }).build().handle(request); + }).handle(request); } @DeleteMapping("/{id}") diff --git a/src/main/resources/generate/java.txt b/src/main/resources/generate/java.txt index 743ae930c65bea5a9c1fced69d7535b86a798fe9..c32605d92f5afeb0fe0f321e025f0f33632548d4 100644 --- a/src/main/resources/generate/java.txt +++ b/src/main/resources/generate/java.txt @@ -2,12 +2,8 @@ package {beanPackageName}; {import} -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter public class {beanName} extends BaseEntity { {filelds} +{getset} } \ No newline at end of file