From e325e920e201e760f2b6fd777cfd1f3ee1ebe35a Mon Sep 17 00:00:00 2001 From: wangbing Date: Wed, 29 Jan 2020 23:37:00 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 342b366139cb05d049804436c46cbdc739835cc2 --- .../SpringBoot/java/action/ajax/Ajax.java | 12 +- .../java/action/ajax/system/LogErrAjax.java | 98 ++++++ .../SpringBoot/java/frame/auth/LocalData.java | 12 +- .../java/module/system/ent/LogErr.java | 116 +++++++ .../java/module/system/mgr/LogErrManager.java | 68 ++++ .../module/system/mgr/LogErrManagerImpl.java | 176 +++++++++++ .../module/system/mgr/TokensManagerImpl.java | 2 +- .../java/module/system/mpr/LogErrMapper.java | 75 +++++ .../module/system/mpr/MySQL_LogErrMapper.xml | 158 ++++++++++ .../system/mpr/MySQL_UserRoleMapper.xml | 4 +- .../system/req/LogErrCreateRequest.java | 117 +++++++ .../system/req/LogErrDeleteRequest.java | 29 ++ .../module/system/req/LogErrFindRequest.java | 94 ++++++ .../module/system/req/LogErrGetRequest.java | 29 ++ .../system/req/LogErrUpdateRequest.java | 131 ++++++++ .../system/rsp/LogErrCreateResponse.java | 26 ++ .../system/rsp/LogErrDeleteResponse.java | 26 ++ .../module/system/rsp/LogErrFindResponse.java | 13 + .../module/system/rsp/LogErrGetResponse.java | 26 ++ .../system/rsp/LogErrUpdateResponse.java | 26 ++ .../resources/dbtool/system/MySQL_LOG_ERR.sql | 23 ++ .../SpringBoot/resources/dbtool/wadmin.xml | 18 ++ .../resources/templates/screen/index.ftl | 9 +- .../templates/screen/module/system/logErr.ftl | 293 ++++++++++++++++++ .../SpringBoot/test/system/LogErrTest.java | 154 +++++++++ .../modules/SpringBoot/test/test.ftl | 2 + 26 files changed, 1729 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/ent/LogErr.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_LogErrMapper.xml create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/req/LogErrCreateRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/req/LogErrDeleteRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/req/LogErrGetRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrCreateResponse.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrDeleteResponse.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrFindResponse.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrGetResponse.java create mode 100644 src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrUpdateResponse.java create mode 100644 src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_LOG_ERR.sql create mode 100644 src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl create mode 100644 src/main/resources/modules/SpringBoot/test/system/LogErrTest.java diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java index ed1a76fa..09c7d3de 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java @@ -15,8 +15,16 @@ import ${basePackage}.frame.excel.exception.ReadErrorException; import ${basePackage}.frame.excel.exception.TemplateNotMatchException; import ${basePackage}.module.${module}.ent.${table.getCName()}; import ${basePackage}.module.${module}.mgr.${table.getCName()}Manager; -import ${basePackage}.module.${module}.req.*; -import ${basePackage}.module.${module}.rsp.*; +import ${basePackage}.module.${module}.req.${table.getCName()}CreateRequest; +import ${basePackage}.module.${module}.req.${table.getCName()}DeleteRequest; +import ${basePackage}.module.${module}.req.${table.getCName()}FindRequest; +import ${basePackage}.module.${module}.req.${table.getCName()}GetRequest; +import ${basePackage}.module.${module}.req.${table.getCName()}UpdateRequest; +import ${basePackage}.module.${module}.rsp.${table.getCName()}CreateResponse; +import ${basePackage}.module.${module}.rsp.${table.getCName()}DeleteResponse; +import ${basePackage}.module.${module}.rsp.${table.getCName()}FindResponse; +import ${basePackage}.module.${module}.rsp.${table.getCName()}GetResponse; +import ${basePackage}.module.${module}.rsp.${table.getCName()}UpdateResponse; import java.io.IOException; import java.util.List; diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java new file mode 100644 index 00000000..3a4b08ed --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java @@ -0,0 +1,98 @@ +package ${basePackage}.action.ajax.system; + +import com.fasterxml.jackson.core.TreeNode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.multipart.MultipartFile; +import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.base.ErrorType; +import ${basePackage}.frame.excel.WExcel; +import ${basePackage}.frame.excel.exception.ReadErrorException; +import ${basePackage}.frame.excel.exception.TemplateNotMatchException; +import ${basePackage}.frame.utils.LogUtil; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.ResponseUtil; +import ${basePackage}.frame.utils.ValidationUtil; +import ${basePackage}.module.system.ent.LogErr; +import ${basePackage}.module.system.mgr.LogErrManager; +import ${basePackage}.module.system.req.LogErrCreateRequest; +import ${basePackage}.module.system.req.LogErrDeleteRequest; +import ${basePackage}.module.system.req.LogErrFindRequest; +import ${basePackage}.module.system.req.LogErrGetRequest; +import ${basePackage}.module.system.req.LogErrUpdateRequest; +import ${basePackage}.module.system.rsp.LogErrCreateResponse; +import ${basePackage}.module.system.rsp.LogErrDeleteResponse; +import ${basePackage}.module.system.rsp.LogErrFindResponse; +import ${basePackage}.module.system.rsp.LogErrGetResponse; +import ${basePackage}.module.system.rsp.LogErrUpdateResponse; + +import java.io.IOException; +import java.util.List; + +public class LogErrAjax { + + @Autowired + private LogErrManager logErrManager; + + public LogErrCreateResponse create(LogErrCreateRequest request) { + return logErrManager.create(request, LocalData.getToken()); + } + + public LogErrDeleteResponse delete(LogErrDeleteRequest request) { + return logErrManager.delete(request, LocalData.getToken()); + } + + public LogErrUpdateResponse update(LogErrUpdateRequest request) { + return logErrManager.update(request, LocalData.getToken()); + } + + public LogErrFindResponse find(LogErrFindRequest request) { + return logErrManager.find(request, LocalData.getToken()); + } + + public LogErrGetResponse get(LogErrGetRequest request) { + return logErrManager.get(request, LocalData.getToken()); + } + + public Object template(){ + return ResponseUtil.apply(new WExcel<>(LogErr.class)); + } + + public Object exports(TreeNode jsonParam) { + LogErrFindRequest request = MapperUtil.toJava(jsonParam, LogErrFindRequest.class); + LogErrFindResponse response = logErrManager.find(request, LocalData.getToken()); + if (response.hasError()) { + return response; + } else if (response.getTotalCount() == 0) { + response.addError(ErrorType.BUSINESS_ERROR, "导出数据为空"); + return response; + } + return ResponseUtil.apply(new WExcel<>(LogErr.class).loadData(response.getResult())); + } + + public Object imports(MultipartFile file) { + BaseResponse baseResponse = new BaseResponse(); + try { + WExcel sheet = new WExcel<>(LogErr.class).loadData(file.getBytes(), new WExcel.Processor() { + @Override + public List exec(LogErr o) { + LogErrCreateRequest request = MapperUtil.map(o, LogErrCreateRequest.class); + return ValidationUtil.validate(request); + } + }); + + if (sheet.hasError()) { + return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); + } else { + return baseResponse; + } + } catch (IOException e) { + e.printStackTrace(); + LogUtil.dumpException(e); + baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件出错"); + } catch (TemplateNotMatchException | ReadErrorException e) { + baseResponse.addError(ErrorType.BUSINESS_ERROR, e.getMessage()); + } + return baseResponse; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java b/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java index 70662c51..be7fda1e 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java +++ b/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java @@ -1,10 +1,11 @@ package ${basePackage}.frame.auth; +import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import ${basePackage}.frame.base.Token; +import xyz.wbsite.frame.base.Token; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -78,7 +79,14 @@ public class LocalData { } public static T getBean(Class t) { - return getApplicationContext().getBean(t); + if (getApplicationContext() == null) { + return null; + } + try { + return getApplicationContext().getBean(t); + } catch (BeansException ignored) { + return null; + } } public static Environment getEnvironment() { diff --git a/src/main/resources/modules/SpringBoot/java/module/system/ent/LogErr.java b/src/main/resources/modules/SpringBoot/java/module/system/ent/LogErr.java new file mode 100644 index 00000000..38edb0a7 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/ent/LogErr.java @@ -0,0 +1,116 @@ +package ${basePackage}.module.system.ent; + +import ${basePackage}.frame.base.BaseEntity; +import ${basePackage}.frame.excel.annotation.ColumnDescription; +import ${basePackage}.frame.excel.annotation.ColumnName; +import ${basePackage}.frame.excel.annotation.SheetName; + +/** + * LOG_ERR - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +@SheetName("错误日志") +public class LogErr extends BaseEntity { + + /** + * LOG_ERR_TYPE - 错误类型 + */ + @ColumnName("错误类型") + @ColumnDescription("") + private String logErrType; + /** + * TITLE - 错误标题 + */ + @ColumnName("错误标题") + @ColumnDescription("") + private String title; + /** + * CONTENT - 错误内容 + */ + @ColumnName("错误内容") + @ColumnDescription("") + private String content; + /** + * LOG_ERR_RESULT - 处理结果 + */ + @ColumnName("处理结果") + @ColumnDescription("") + private String logErrResult; + /** + * ATTRIBUTE1 - 属性1 + */ + @ColumnName("属性1") + @ColumnDescription("") + private String attribute1; + /** + * ATTRIBUTE2 - 属性2 + */ + @ColumnName("属性2") + @ColumnDescription("") + private String attribute2; + /** + * ATTRIBUTE3 - 属性3 + */ + @ColumnName("属性3") + @ColumnDescription("") + private String attribute3; + + public String getLogErrType() { + return this.logErrType; + } + + public void setLogErrType(String logErrType) { + this.logErrType = logErrType; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getLogErrResult() { + return this.logErrResult; + } + + public void setLogErrResult(String logErrResult) { + this.logErrResult = logErrResult; + } + + public String getAttribute1() { + return this.attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return this.attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return this.attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } +} \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java new file mode 100644 index 00000000..a0609b69 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java @@ -0,0 +1,68 @@ +package ${basePackage}.module.system.mgr; + +import ${basePackage}.frame.base.Token; +import ${basePackage}.module.system.req.LogErrCreateRequest; +import ${basePackage}.module.system.req.LogErrDeleteRequest; +import ${basePackage}.module.system.req.LogErrFindRequest; +import ${basePackage}.module.system.req.LogErrGetRequest; +import ${basePackage}.module.system.req.LogErrUpdateRequest; +import ${basePackage}.module.system.rsp.LogErrCreateResponse; +import ${basePackage}.module.system.rsp.LogErrDeleteResponse; +import ${basePackage}.module.system.rsp.LogErrFindResponse; +import ${basePackage}.module.system.rsp.LogErrGetResponse; +import ${basePackage}.module.system.rsp.LogErrUpdateResponse; + +/** + * 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public interface LogErrManager { + + /** + * 插入 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + LogErrCreateResponse create(LogErrCreateRequest request, Token token); + + /** + * 逻辑删除 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token); + + /** + * 更新 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + LogErrUpdateResponse update(LogErrUpdateRequest request, Token token); + + /** + * 查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + LogErrFindResponse find(LogErrFindRequest request, Token token); + + /** + * 获得对象 + * + * @param request 请求对象 + * @param token 令牌 + * @return + */ + LogErrGetResponse get(LogErrGetRequest request, Token token); +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java new file mode 100644 index 00000000..11aac35c --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java @@ -0,0 +1,176 @@ +package ${basePackage}.module.system.mgr; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ${basePackage}.frame.base.ErrorType; +import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.utils.IDgenerator; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.Message; +import ${basePackage}.frame.utils.ValidationUtil; +import ${basePackage}.module.system.mpr.LogErrMapper; +import ${basePackage}.module.system.req.LogErrCreateRequest; +import ${basePackage}.module.system.req.LogErrDeleteRequest; +import ${basePackage}.module.system.req.LogErrFindRequest; +import ${basePackage}.module.system.req.LogErrGetRequest; +import ${basePackage}.module.system.req.LogErrUpdateRequest; +import ${basePackage}.module.system.rsp.LogErrCreateResponse; +import ${basePackage}.module.system.rsp.LogErrDeleteResponse; +import ${basePackage}.module.system.rsp.LogErrFindResponse; +import ${basePackage}.module.system.rsp.LogErrGetResponse; +import ${basePackage}.module.system.rsp.LogErrUpdateResponse; + +/** + * LOG_ERR - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +@Transactional +@Service +public class LogErrManagerImpl implements ${basePackage}.module.system.mgr.LogErrManager { + + @Autowired + private LogErrMapper logErrMapper; + + /** + * 插入 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + public LogErrCreateResponse create(LogErrCreateRequest request, Token token) { + LogErrCreateResponse response = new LogErrCreateResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + long id = IDgenerator.nextId(); + ${basePackage}.module.system.ent.LogErr entity = MapperUtil.map(request, ${basePackage}.module.system.ent.LogErr.class); + entity.setId(id); + + long result = logErrMapper.insert(entity, token); + if (1L != result) { + response.addError(ErrorType.BUSINESS_ERROR, Message.CREATE_FAILURE); + return response; + } + response.setId(id); + + return response; + } + + /** + * 逻辑删除 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + public LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token) { + LogErrDeleteResponse response = new LogErrDeleteResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + long result = logErrMapper.delete(request, token); + if (1L != result) { + response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE); + return response; + } + response.setResult(result); + + return response; + } + + /** + * 更新 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + public LogErrUpdateResponse update(LogErrUpdateRequest request, Token token) { + LogErrUpdateResponse response = new LogErrUpdateResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + long result = logErrMapper.update(request, token); + if (1L != result) { + response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE); + return response; + } + response.setResult(result); + + return response; + } + + /** + * 查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + @Transactional(readOnly = true) + public LogErrFindResponse find(LogErrFindRequest request, Token token) { + LogErrFindResponse response = new LogErrFindResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + if (request.getPageSize() != 0) { + PageHelper.startPage(request.getPageNumber(), request.getPageSize()); + } + if (StringUtil.isNotEmpty(request.getSortKey())) { + PageHelper.orderBy(request.getSortKey() + " " + request.getSortType()); + } + PageInfo<${basePackage}.module.system.ent.LogErr> pageInfo = new PageInfo<>(logErrMapper.find(request, token)); + + response.setResult(pageInfo.getList()); + response.setTotalCount(pageInfo.getTotal()); + + return response; + } + + /** + * 获得对象 + * + * @param request 请求对象 + * @param token 令牌 + * @return 响应 + */ + @Transactional(readOnly = true) + public LogErrGetResponse get(LogErrGetRequest request, Token token) { + LogErrGetResponse response = new LogErrGetResponse(); + + ValidationUtil.validate(request, response); + if (response.hasError()) { + return response; + } + + ${basePackage}.module.system.ent.LogErr po = logErrMapper.get(request, token); + + if (po != null) { + response.setLogErr(po); + } else { + response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE); + } + + return response; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java index 2b7a0ab0..c09e108e 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java @@ -45,7 +45,7 @@ import ${basePackage}.module.system.rsp.TokensUpdateResponse; */ @Transactional @Service -public class TokensManagerImpl implements xyz.wbsite.module.system.mgr.TokensManager { +public class TokensManagerImpl implements ${basePackage}.module.system.mgr.TokensManager { @Value("${r'${web.url.auth.admin}'}") private String admin; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java new file mode 100644 index 00000000..28bacb7e --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java @@ -0,0 +1,75 @@ +package ${basePackage}.module.system.mpr; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import ${basePackage}.frame.base.Token; +import ${basePackage}.module.system.req.LogErrDeleteRequest; +import ${basePackage}.module.system.req.LogErrFindRequest; +import ${basePackage}.module.system.req.LogErrGetRequest; +import ${basePackage}.module.system.req.LogErrUpdateRequest; + +import java.util.List; + +/** + * LOG_ERR - 错误日志 + * + * @author wangbing + * @date 2020-01-29 + */ +@Mapper +public interface LogErrMapper { + + /** + * 插入 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回数量 + */ + long insert(@Param("request") ${basePackage}.module.system.ent.LogErr request, @Param("token") Token token); + + /** + * 批量插入 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回数量 + */ + long insertBatch(@Param("list") List<${basePackage}.module.system.ent.LogErr> request, @Param("token") Token token); + + /** + * 逻辑删除 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回数量 + */ + long delete(@Param("request") LogErrDeleteRequest request, @Param("token") Token token); + + /** + * 更新 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回数量 + */ + long update(@Param("request") LogErrUpdateRequest request, @Param("token") Token token); + + /** + * 查询 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + List<${basePackage}.module.system.ent.LogErr> find(@Param("request") LogErrFindRequest request, @Param("token") Token token); + + /** + * 获得对象 + * + * @param request 请求对象 + * @param token 令牌 + * @return 返回对象 + */ + ${basePackage}.module.system.ent.LogErr get(@Param("request") LogErrGetRequest request, @Param("token") Token token); +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_LogErrMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_LogErrMapper.xml new file mode 100644 index 00000000..13589ebb --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_LogErrMapper.xml @@ -0,0 +1,158 @@ + + + + + `SYS_LOG_ERR` + + + `ID`,`LOG_ERR_TYPE`,`TITLE`,`CONTENT`,`LOG_ERR_RESULT`,`ATTRIBUTE1`,`ATTRIBUTE2`,`ATTRIBUTE3`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME` + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO + + ( + + ) + VALUES + ( + ${r'#'}{request.id}, + ${r'#'}{request.logErrType,jdbcType=VARCHAR}, + ${r'#'}{request.title,jdbcType=VARCHAR}, + ${r'#'}{request.content,jdbcType=VARCHAR}, + ${r'#'}{request.logErrResult,jdbcType=VARCHAR}, + ${r'#'}{request.attribute1,jdbcType=VARCHAR}, + ${r'#'}{request.attribute2,jdbcType=VARCHAR}, + ${r'#'}{request.attribute3,jdbcType=VARCHAR}, + 0, + 0, + ${r'#'}{token.userId,jdbcType=NUMERIC}, + sysdate(), + NULL, + NULL + ) + + + + INSERT INTO + + ( + + ) + VALUES + + ( + ${r'#'}{item.id}, + ${r'#'}{item.logErrType,jdbcType=VARCHAR}, + ${r'#'}{item.title,jdbcType=VARCHAR}, + ${r'#'}{item.content,jdbcType=VARCHAR}, + ${r'#'}{item.logErrResult,jdbcType=VARCHAR}, + ${r'#'}{item.attribute1,jdbcType=VARCHAR}, + ${r'#'}{item.attribute2,jdbcType=VARCHAR}, + ${r'#'}{item.attribute3,jdbcType=VARCHAR}, + 0, + 0, + ${r'#'}{token.userId,jdbcType=NUMERIC}, + sysdate(), + NULL, + NULL + ) + + + + + UPDATE + + SET `IS_DELETED` = 1 + WHERE `IS_DELETED` = 0 + AND `ID` = ${r'#'}{request.id} + + + + UPDATE + + SET + `LOG_ERR_TYPE` = ${r'#'}{request.logErrType,jdbcType=VARCHAR}, + `TITLE` = ${r'#'}{request.title,jdbcType=VARCHAR}, + `CONTENT` = ${r'#'}{request.content,jdbcType=VARCHAR}, + `LOG_ERR_RESULT` = ${r'#'}{request.logErrResult,jdbcType=VARCHAR}, + `ATTRIBUTE1` = ${r'#'}{request.attribute1,jdbcType=VARCHAR}, + `ATTRIBUTE2` = ${r'#'}{request.attribute2,jdbcType=VARCHAR}, + `ATTRIBUTE3` = ${r'#'}{request.attribute3,jdbcType=VARCHAR}, + `ROW_VERSION` = `ROW_VERSION` + 1, + `LAST_UPDATE_BY` = ${r'#'}{token.userId}, + `LAST_UPDATE_TIME` = sysdate() + WHERE + `IS_DELETED` = 0 + AND `ID` = ${r'#'}{request.id} + AND `ROW_VERSION` = ${r'#'}{request.rowVersion} + + + + \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserRoleMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserRoleMapper.xml index c754b702..eef38600 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserRoleMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_UserRoleMapper.xml @@ -2,7 +2,7 @@ - + `SYS_USER_ROLE` @@ -10,7 +10,7 @@ `ID`,`USER_ID`,`USER_CODE`,`ROLE_ID`,`ROLE_CODE`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME` - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrCreateRequest.java new file mode 100644 index 00000000..34b5f3fc --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrCreateRequest.java @@ -0,0 +1,117 @@ +package ${basePackage}.module.system.req; + +import org.hibernate.validator.constraints.Length; +import ${basePackage}.frame.base.BaseRequest; +import ${basePackage}.frame.validation.Dict; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * LogErrCreateRequest - 错误日志新增 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrCreateRequest extends BaseRequest { + + /** + * 错误类型 + */ + @Dict(name = "LOG_ERR_TYPE") + private String logErrType; + + /** + * 错误标题 + */ + @NotEmpty(message = "[title]错误标题不能为空") + @Length(min = 0, max = 50, message = "[title]错误标题长度不合法(0-50)") + private String title; + + /** + * 错误内容 + */ + private String content; + + /** + * 处理结果 + */ + @NotNull(message = "[logErrResult]处理结果不能为NULL") + @Dict(name = "LOG_ERR_RESULT") + private String logErrResult; + + /** + * 属性1 + */ + @Length(min = 0, max = 50, message = "[attribute1]属性1长度不合法(0-50)") + private String attribute1; + + /** + * 属性2 + */ + @Length(min = 0, max = 50, message = "[attribute2]属性2长度不合法(0-50)") + private String attribute2; + + /** + * 属性3 + */ + @Length(min = 0, max = 50, message = "[attribute3]属性3长度不合法(0-50)") + private String attribute3; + + public String getLogErrType() { + return this.logErrType; + } + + public void setLogErrType(String logErrType) { + this.logErrType = logErrType; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getLogErrResult() { + return this.logErrResult; + } + + public void setLogErrResult(String logErrResult) { + this.logErrResult = logErrResult; + } + + public String getAttribute1() { + return this.attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return this.attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return this.attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrDeleteRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrDeleteRequest.java new file mode 100644 index 00000000..a15f4e84 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrDeleteRequest.java @@ -0,0 +1,29 @@ +package ${basePackage}.module.system.req; + +import ${basePackage}.frame.base.BaseUpdateRequest; + +import javax.validation.constraints.NotNull; + +/** + * LogErrDeleteRequest - 错误日志删除 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrDeleteRequest extends BaseUpdateRequest { + + /** + * 主键 + */ + @NotNull(message = "[id]主键不能为空") + private long id; + + public long getId() { + return this.id; + } + + public void setId(long id) { + this.id = id; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java new file mode 100644 index 00000000..0a64a5e8 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java @@ -0,0 +1,94 @@ +package ${basePackage}.module.system.req; + +import ${basePackage}.frame.base.BaseFindRequest; +import ${basePackage}.frame.validation.Dict; + +/** + * LogErrRequest - 错误日志查询 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrFindRequest extends BaseFindRequest { + + /** + * 错误类型 + */ + @Dict(name = "LOG_ERR_TYPE") + private String logErrType; + + /** + * 错误标题 + */ + private String title; + + /** + * 处理结果 + */ + @Dict(name = "LOG_ERR_RESULT") + private String logErrResult; + + /** + * 属性1 + */ + private String attribute1; + + /** + * 属性2 + */ + private String attribute2; + + /** + * 属性3 + */ + private String attribute3; + + public String getLogErrType() { + return this.logErrType; + } + + public void setLogErrType(String logErrType) { + this.logErrType = logErrType; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getLogErrResult() { + return this.logErrResult; + } + + public void setLogErrResult(String logErrResult) { + this.logErrResult = logErrResult; + } + + public String getAttribute1() { + return this.attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return this.attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return this.attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrGetRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrGetRequest.java new file mode 100644 index 00000000..f6e3ccaa --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrGetRequest.java @@ -0,0 +1,29 @@ +package ${basePackage}.module.system.req; + +import ${basePackage}.frame.base.BaseRequest; + +import javax.validation.constraints.NotNull; + +/** + * LogErrGetRequest - 错误日志获取 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrGetRequest extends BaseRequest { + + /** + * 主键 + */ + @NotNull(message = "[id]主键不能为空") + private long id; + + public long getId() { + return this.id; + } + + public void setId(long id) { + this.id = id; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java new file mode 100644 index 00000000..bdf57821 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java @@ -0,0 +1,131 @@ +package ${basePackage}.module.system.req; + +import org.hibernate.validator.constraints.Length; +import ${basePackage}.frame.base.BaseUpdateRequest; +import ${basePackage}.frame.validation.Dict; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * LogErrUpdateRequest - 错误日志更新 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrUpdateRequest extends BaseUpdateRequest { + + /** + * 主键 + */ + @NotNull(message = "[id]主键不能为NULL") + private Long id; + + /** + * 错误类型 + */ + @Dict(name = "LOG_ERR_TYPE") + private String logErrType; + + /** + * 错误标题 + */ + @NotEmpty(message = "[title]错误标题不能为空") + @Length(min = 0, max = 50, message = "[title]错误标题长度不合法(0-50)") + private String title; + + /** + * 错误内容 + */ + private String content; + + /** + * 处理结果 + */ + @NotNull(message = "[logErrResult]处理结果不能为NULL") + @Dict(name = "LOG_ERR_RESULT") + private String logErrResult; + + /** + * 属性1 + */ + @Length(min = 0, max = 50, message = "[attribute1]属性1长度不合法(0-50)") + private String attribute1; + + /** + * 属性2 + */ + @Length(min = 0, max = 50, message = "[attribute2]属性2长度不合法(0-50)") + private String attribute2; + + /** + * 属性3 + */ + @Length(min = 0, max = 50, message = "[attribute3]属性3长度不合法(0-50)") + private String attribute3; + + public Long getId() { + return this.id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getLogErrType() { + return this.logErrType; + } + + public void setLogErrType(String logErrType) { + this.logErrType = logErrType; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getLogErrResult() { + return this.logErrResult; + } + + public void setLogErrResult(String logErrResult) { + this.logErrResult = logErrResult; + } + + public String getAttribute1() { + return this.attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return this.attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return this.attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrCreateResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrCreateResponse.java new file mode 100644 index 00000000..9dbc0b8b --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrCreateResponse.java @@ -0,0 +1,26 @@ +package ${basePackage}.module.system.rsp; + +import ${basePackage}.frame.base.BaseResponse; + +/** + * LogErrCreateResponse - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrCreateResponse extends BaseResponse { + + /** + * 主键 + */ + private Long id; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrDeleteResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrDeleteResponse.java new file mode 100644 index 00000000..3468b999 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrDeleteResponse.java @@ -0,0 +1,26 @@ +package ${basePackage}.module.system.rsp; + +import ${basePackage}.frame.base.BaseResponse; + +/** + * LogErrDeleteResponse - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrDeleteResponse extends BaseResponse { + + /** + * 删除数目 + */ + private Long result; + + public Long getResult() { + return this.result; + } + + public void setResult(Long result) { + this.result = result; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrFindResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrFindResponse.java new file mode 100644 index 00000000..aaddc771 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrFindResponse.java @@ -0,0 +1,13 @@ +package ${basePackage}.module.system.rsp; + +import ${basePackage}.frame.base.BaseFindResponse; + +/** + * LogErrFindResponse - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrFindResponse extends BaseFindResponse<${basePackage}.module.system.ent.LogErr> { +} \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrGetResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrGetResponse.java new file mode 100644 index 00000000..bc000c65 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrGetResponse.java @@ -0,0 +1,26 @@ +package ${basePackage}.module.system.rsp; + +import ${basePackage}.frame.base.BaseResponse; + +/** + * LogErrGetResponse - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrGetResponse extends BaseResponse { + + /** + * 错误日志 + */ + private ${basePackage}.module.system.ent.LogErr logErr; + + public ${basePackage}.module.system.ent.LogErr getLogErr() { + return this.logErr; + } + + public void setLogErr(${basePackage}.module.system.ent.LogErr logErr) { + this.logErr = logErr; + } +} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrUpdateResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrUpdateResponse.java new file mode 100644 index 00000000..d6f3afec --- /dev/null +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/LogErrUpdateResponse.java @@ -0,0 +1,26 @@ +package ${basePackage}.module.system.rsp; + +import ${basePackage}.frame.base.BaseResponse; + +/** + * LogErrUpdateResponse - 错误日志 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +public class LogErrUpdateResponse extends BaseResponse { + + /** + * 更新数目 + */ + private Long result; + + public Long getResult() { + return this.result; + } + + public void setResult(Long result) { + this.result = result; + } +} diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_LOG_ERR.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_LOG_ERR.sql new file mode 100644 index 00000000..e8d15608 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_LOG_ERR.sql @@ -0,0 +1,23 @@ +-- ---------------------------- +-- Table structure for LOG_ERR - 错误日志 +-- Target : MySQL +-- Author : wangbing +-- Date: : 2020-01-29 +-- ---------------------------- +CREATE TABLE `SYS_LOG_ERR` ( + `ID` BIGINT(20) NOT NULL COMMENT '主键', + `LOG_ERR_TYPE` VARCHAR(20) COMMENT '错误类型', + `TITLE` VARCHAR(50) NOT NULL COMMENT '错误标题', + `CONTENT` TEXT COMMENT '错误内容', + `LOG_ERR_RESULT` VARCHAR(20) NOT NULL COMMENT '处理结果', + `ATTRIBUTE1` VARCHAR(50) COMMENT '属性1', + `ATTRIBUTE2` VARCHAR(50) COMMENT '属性2', + `ATTRIBUTE3` VARCHAR(50) COMMENT '属性3', + `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本', + `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除', + `CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户', + `CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间', + `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', + `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', +PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml index 363df9cb..af14ee3f 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml @@ -182,6 +182,24 @@ + + + + + + + + + + + + + + + + + +
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl index 93be8b6e..298f6dfe 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl @@ -30,7 +30,14 @@ 计划任务 - 任务列表 + 任务列表 + + + + 错误日志 <#list modules as item> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl new file mode 100644 index 00000000..bc8e7925 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/logErr.ftl @@ -0,0 +1,293 @@ +
+ + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + 新增 + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 保存 + + +
+ diff --git a/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java b/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java new file mode 100644 index 00000000..8b16c0a6 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java @@ -0,0 +1,154 @@ +package ${basePackage}.system; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.transaction.annotation.Transactional; +import ${basePackage}.frame.base.Token; +import ${basePackage}.module.system.mgr.LogErrManager; +import ${basePackage}.module.system.req.LogErrCreateRequest; +import ${basePackage}.module.system.req.LogErrDeleteRequest; +import ${basePackage}.module.system.req.LogErrFindRequest; +import ${basePackage}.module.system.req.LogErrGetRequest; +import ${basePackage}.module.system.req.LogErrUpdateRequest; +import ${basePackage}.module.system.rsp.LogErrCreateResponse; +import ${basePackage}.module.system.rsp.LogErrDeleteResponse; +import ${basePackage}.module.system.rsp.LogErrFindResponse; +import ${basePackage}.module.system.rsp.LogErrGetResponse; +import ${basePackage}.module.system.rsp.LogErrUpdateResponse; + +import static junit.framework.TestCase.assertTrue; + +/** + * LogErrTest - - 错误日志测试用例 + * + * @author wangbing + * @version 0.0.1 + * @since 2020-01-29 + */ +@RunWith(SpringRunner.class) +@SpringBootTest +@Transactional +public class LogErrTest { + + @Autowired + private Token token; + + @Autowired + private LogErrManager logErrManager; + + @Test + public void testCreate() { + LogErrCreateRequest request = new LogErrCreateRequest(); + request.setLogErrType("code"); + request.setTitle("错误标题"); + request.setContent("content"); + request.setLogErrResult("code"); + request.setAttribute1("属性1"); + request.setAttribute2("属性2"); + request.setAttribute3("属性3"); + + LogErrCreateResponse response = logErrManager.create(request,token); + + assertTrue(!response.hasError()); + } + + @Test + public void testDelete() { + + //创建数据 + LogErrCreateRequest createRequest = new LogErrCreateRequest(); + createRequest.setLogErrType("code"); + createRequest.setTitle("错误标题"); + createRequest.setContent("content"); + createRequest.setLogErrResult("code"); + createRequest.setAttribute1("属性1"); + createRequest.setAttribute2("属性2"); + createRequest.setAttribute3("属性3"); + + LogErrCreateResponse createResponse = logErrManager.create(createRequest,token); + + assertTrue(!createResponse.hasError() && createResponse.getId() > 0); + //删除数据 + LogErrDeleteRequest request = new LogErrDeleteRequest(); + request.setId(createResponse.getId()); + + LogErrDeleteResponse response = logErrManager.delete(request,token); + + assertTrue(!response.hasError() && response.getResult() == 1L); + } + + @Test + public void testUpdate() { + //创建数据 + LogErrCreateRequest createRequest = new LogErrCreateRequest(); + createRequest.setLogErrType("code"); + createRequest.setTitle("错误标题"); + createRequest.setContent("content"); + createRequest.setLogErrResult("code"); + createRequest.setAttribute1("属性1"); + createRequest.setAttribute2("属性2"); + createRequest.setAttribute3("属性3"); + + LogErrCreateResponse createResponse = logErrManager.create(createRequest, token); + + assertTrue(!createResponse.hasError()); + + //更新数据 + LogErrUpdateRequest request = new LogErrUpdateRequest(); + request.setId(createResponse.getId()); + request.setLogErrType("code"); + request.setTitle("错误标题"); + request.setContent("content"); + request.setLogErrResult("code"); + request.setAttribute1("属性1"); + request.setAttribute2("属性2"); + request.setAttribute3("属性3"); + + LogErrUpdateResponse response = logErrManager.update(request,token); + + assertTrue(!response.hasError() && response.getResult() == 1L); + } + + @Test + public void testFind() { + LogErrFindRequest request = new LogErrFindRequest(); + request.setLogErrType("code"); + request.setTitle("错误标题"); + request.setLogErrResult("code"); + request.setAttribute1("属性1"); + request.setAttribute2("属性2"); + request.setAttribute3("属性3"); + + LogErrFindResponse response = logErrManager.find(request,token); + + assertTrue(!response.hasError()); + } + + @Test + public void testGet() { + //创建数据 + LogErrCreateRequest createRequest = new LogErrCreateRequest(); + createRequest.setLogErrType("code"); + createRequest.setTitle("错误标题"); + createRequest.setContent("content"); + createRequest.setLogErrResult("code"); + createRequest.setAttribute1("属性1"); + createRequest.setAttribute2("属性2"); + createRequest.setAttribute3("属性3"); + + LogErrCreateResponse createResponse = logErrManager.create(createRequest, token); + + assertTrue(!createResponse.hasError()); + + //获得数据 + LogErrGetRequest request = new LogErrGetRequest(); + request.setId(createResponse.getId()); + + LogErrGetResponse response = logErrManager.get(request,token); + + assertTrue(!response.hasError() && response.getLogErr() != null); + } +} diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index 29133a06..1d6f02b1 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -22,6 +22,8 @@ import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse; import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse; import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse; +import static junit.framework.TestCase.assertTrue; + /** * ${table.getCName()}Test - - ${table.tableComment}测试用例 *