From fea4dc4540ed028124ab1aab64c460691c00a1a7 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Tue, 2 Feb 2021 23:54:24 +0800 Subject: [PATCH] 1 --- hchyun-ui/.env.development | 4 +- hchyun-ui/src/api/tool/query.js | 16 ++ hchyun-ui/src/router/index.js | 8 +- hchyun-ui/src/views/tool/query/queryDate.vue | 131 ++++++++++++++ hchyun-ui/src/views/tool/query/uniQuery.vue | 66 +++++-- .../common/constant/ReturnConstants.java | 2 + .../hchyun/common/core/entity/AjaxResult.java | 2 +- .../hchyun/common/core/entity/BaseEntity.java | 2 +- .../hchyun/common/core/entity/TreeEntity.java | 2 +- .../hchyun/common/core/entity/TreeSelect.java | 2 +- .../common/core/entity/entity/SysDept.java | 2 +- .../core/entity/entity/SysDictData.java | 2 +- .../core/entity/entity/SysDictType.java | 2 +- .../common/core/entity/entity/SysMenu.java | 2 +- .../common/core/entity/entity/SysRole.java | 2 +- .../common/core/entity/entity/SysUser.java | 2 +- .../common/core/entity/model/LoginUser.java | 2 +- .../common/core/page/TableDataInfo.java | 2 +- .../common/exception/BaseException.java | 2 +- .../common/exception/CustomException.java | 2 +- .../common/exception/DemoModeException.java | 2 +- .../common/exception/file/FileException.java | 2 +- .../FileNameLengthLimitExceededException.java | 2 +- .../file/FileSizeLimitExceededException.java | 2 +- .../file/InvalidExtensionException.java | 8 +- .../common/exception/job/TaskException.java | 2 +- .../exception/user/CaptchaException.java | 2 +- .../user/CaptchaExpireException.java | 2 +- .../common/exception/user/UserException.java | 2 +- .../user/UserPasswordNotMatchException.java | 2 +- .../generator/controller/QueryController.java | 92 +++++++--- .../com/hchyun/generator/dao/QueryDao.java | 3 + .../com/hchyun/generator/entity/Apiclass.java | 2 +- .../com/hchyun/generator/entity/GenTable.java | 2 +- .../generator/entity/GenTableColumn.java | 2 +- .../com/hchyun/generator/entity/Module.java | 2 +- .../com/hchyun/generator/entity/UniCon.java | 15 +- .../com/hchyun/generator/entity/UniQuery.java | 24 ++- .../generator/service/QueryService.java | 15 ++ .../service/impl/QueryServiceImpl.java | 165 +++++++++++++----- .../mapper/generator/QueryMapper.xml | 4 + .../mapper/generator/UniQueryMapper.xml | 3 +- .../java/com/hchyun/quartz/entity/SysJob.java | 2 +- .../com/hchyun/quartz/entity/SysJobLog.java | 2 +- .../com/hchyun/system/entity/Regular.java | 2 +- .../com/hchyun/system/entity/SysConfig.java | 2 +- .../hchyun/system/entity/SysLogininfor.java | 2 +- .../com/hchyun/system/entity/SysNotice.java | 2 +- .../com/hchyun/system/entity/SysOperLog.java | 2 +- .../com/hchyun/system/entity/SysPost.java | 2 +- .../java/com/hchyun/test/entity/Results.java | 2 +- .../main/java/com/hchyun/test/entity/Stu.java | 2 +- .../java/com/hchyun/test/entity/TestTree.java | 2 +- 53 files changed, 503 insertions(+), 129 deletions(-) create mode 100644 hchyun-ui/src/views/tool/query/queryDate.vue diff --git a/hchyun-ui/.env.development b/hchyun-ui/.env.development index a916e78..3246ca5 100644 --- a/hchyun-ui/.env.development +++ b/hchyun-ui/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 宏驰云管理系统/开发环境 #VUE_APP_BASE_API = '/dev-api' -#VUE_APP_BASE_API = 'http://localhost:8085/dev-api' -VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' +VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +#VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/hchyun-ui/src/api/tool/query.js b/hchyun-ui/src/api/tool/query.js index fa0ce2c..0500b4b 100644 --- a/hchyun-ui/src/api/tool/query.js +++ b/hchyun-ui/src/api/tool/query.js @@ -76,3 +76,19 @@ export function previewQueryData(data) { data: data }) } + +// 获取查询基本信息 +export function getRealInfo(id){ + return request({ + url: "/query/real/"+id, + method: 'get', + }) +} +// 查询数据 +export function getRealData(data){ + return request({ + url: "/query/real", + method: 'put', + data:data + }) +} diff --git a/hchyun-ui/src/router/index.js b/hchyun-ui/src/router/index.js index 9f9a668..161edad 100644 --- a/hchyun-ui/src/router/index.js +++ b/hchyun-ui/src/router/index.js @@ -129,7 +129,13 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/tool/query/uniQuery'], resolve), name: 'UniQuery', meta: { title: '万能查询配置' } - } + }, + // { + // path: 'data/:dataId(\\d+)', + // component: (resolve) => require(['@/views/tool/query/queryDate'], resolve), + // name: 'QueryDate', + // meta: { title: '信息统计' } + // } ] }, { diff --git a/hchyun-ui/src/views/tool/query/queryDate.vue b/hchyun-ui/src/views/tool/query/queryDate.vue new file mode 100644 index 0000000..1bdace2 --- /dev/null +++ b/hchyun-ui/src/views/tool/query/queryDate.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/hchyun-ui/src/views/tool/query/uniQuery.vue b/hchyun-ui/src/views/tool/query/uniQuery.vue index e5cf2b8..545fad1 100644 --- a/hchyun-ui/src/views/tool/query/uniQuery.vue +++ b/hchyun-ui/src/views/tool/query/uniQuery.vue @@ -160,6 +160,7 @@ import {Message} from "element-ui"; function JSONString(list) { for (let i = 0; i < list.length; i++) { + if (list[i].type == 2) { list[i].ucMock = JSON.stringify(list[i].ucMock) } else if (list[i].type == 4) { @@ -193,7 +194,7 @@ export default { tableHeight: document.documentElement.scrollHeight - 245 + "px", // 表列信息 cloumns: [], - sqlconfig:{ + sqlconfig: { // 默认的语法类型 mode: 'sql', // 编辑器实例 @@ -204,8 +205,8 @@ export default { tabSize: 4, // 主题，对应主题库 JS 需要提前引入 theme: 'idea', - spellcheck:true, - cursorHeight:0.85, + spellcheck: true, + cursorHeight: 0.85, // 显示行号 lineNumbers: true, line: true, @@ -248,12 +249,48 @@ export default { this.sqlconfig.coder.setValue(this.info.uqSql) }) this.$nextTick(function () { - this._initialize(); + this.initialize(); }); }, mounted() { }, methods: { + changUniCon(list) { + console.log(list[0]) + console.log(list.length) + for (let i = 0; i < list.length; i++) { + console.log(list[0].ucName) + if (list[i].ucName == "") { + Message({ + message: "序号" + i + "查询名称不能为空!", + type: 'error' + }) + return false; + } + if (list[i].ucDescribe == "") { + Message({ + message: "序号" + i + "描述不能为空!", + type: 'error' + }) + return false; + } + if (list[i].ucKey == "") { + Message({ + message: "序号" + i + "key不能为空!", + type: 'error' + }) + return false; + } + if (list[i].ucMock == "") { + Message({ + message: "序号" + i + "模拟数据不能为空!", + type: 'error' + }) + return false; + } + } + return true + }, /** 预览 */ previewQuery() { this.$refs['elForm'].validate(valid => { @@ -261,7 +298,11 @@ export default { let list = JSONString(this.cloumns) let data = this.info if (list.length > 0) { - data.uniCons = list + if (this.changUniCon(list)) { + data.uniCons = list + } else { + return + } } data.pageNum = this.queryParams.pageNum data.pageSize = this.queryParams.pageSize @@ -275,21 +316,18 @@ export default { this.previewDate.open = true this.cloumns = JSONparse(list) }) - } else { - return } }) }, - sqlChang(){ + sqlChang() { console.log(this.sqlconfig.coder.getValue()) }, - _initialize() { + initialize() { // 初始化编辑器实例，传入需要被实例化的文本域对象和默认配置 this.sqlconfig.coder = CodeMirror.fromTextArea(this.$refs.textarea, this.sqlconfig.options) // 编辑器赋值 this.sqlconfig.coder.setValue(this.info.uqSql) - console.log(this.sqlconfig.coder.cm.defaultCharWidth(1)) - // 支持双向绑定 + // 支持双向绑定 this.sqlconfig.coder.on('change', (coder) => { this.info.uqSql = coder.getValue() console.log(this.info.uqSql) @@ -367,11 +405,13 @@ export default { border: 1px solid #DCDFE6; height: 150px; } -.CodeMirror-line{ + +.CodeMirror-line { height: 20px; line-height: 20px !important; } -.CodeMirror-linenumber{ + +.CodeMirror-linenumber { height: 20px; line-height: 20px !important; } diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/ReturnConstants.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/ReturnConstants.java index e7c7f33..6c3f4de 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/ReturnConstants.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/constant/ReturnConstants.java @@ -22,4 +22,6 @@ public class ReturnConstants { * 接口为空 */ public static final String INTER_NULL = "该类下接口数据为空,请先添加接口!"; + + public static final String STATE_ERROR = "状态错错误!"; } diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java index 3e6079e..d69998e 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java @@ -11,7 +11,7 @@ import com.hchyun.common.utils.StringUtils; * @author hchyun */ public class AjaxResult extends HashMap { - private static final long serialVersionUID = 1L; + /** * 状态码 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java index 48d4d71..15628cb 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; * @author hchyun */ public class BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; + /** * 搜索值 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java index 4f174ae..21874b0 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java @@ -10,7 +10,7 @@ import java.util.List; */ public class TreeEntity extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 父菜单名称 */ private String parentName; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java index b33ebbd..89acdc5 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java @@ -14,7 +14,7 @@ import com.hchyun.common.core.entity.entity.SysMenu; */ public class TreeSelect implements Serializable { - private static final long serialVersionUID = 1L; + /** 节点ID */ private Long id; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java index e6693ab..17d6f47 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java @@ -16,7 +16,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysDept extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 部门ID */ private Long deptId; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java index b99c015..99f5dce 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java @@ -16,7 +16,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysDictData extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 字典编码 */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java index 12b0af8..4c81342 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java @@ -15,7 +15,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysDictType extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java index 4a8477a..0409ff1 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java @@ -15,7 +15,7 @@ import com.hchyun.common.core.entity.BaseEntity; * @author hchyun */ public class SysMenu extends BaseEntity { - private static final long serialVersionUID = 1L; + /** * 菜单ID diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java index 3406b9a..68db1ab 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java @@ -15,7 +15,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysRole extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 角色ID */ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java index 2499bba..80b314c 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java @@ -22,7 +22,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysUser extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 用户ID */ @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java index 8d1f3f5..ea9afe0 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java @@ -14,7 +14,7 @@ import com.hchyun.common.core.entity.entity.SysUser; */ public class LoginUser implements UserDetails { - private static final long serialVersionUID = 1L; + /** * 用户唯一标识 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableDataInfo.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableDataInfo.java index 43bfe15..bafb1a1 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableDataInfo.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/page/TableDataInfo.java @@ -10,7 +10,7 @@ import java.util.List; */ public class TableDataInfo implements Serializable { - private static final long serialVersionUID = 1L; + /** 总记录数 */ private long total; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/BaseException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/BaseException.java index 596eb12..4332f0b 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/BaseException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/BaseException.java @@ -10,7 +10,7 @@ import com.hchyun.common.utils.StringUtils; */ public class BaseException extends RuntimeException { - private static final long serialVersionUID = 1L; + /** * 所属模块 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/CustomException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/CustomException.java index ca6621d..03affaa 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/CustomException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/CustomException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception; */ public class CustomException extends RuntimeException { - private static final long serialVersionUID = 1L; + private Integer code; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/DemoModeException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/DemoModeException.java index fdbcfff..f1c8935 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/DemoModeException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/DemoModeException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception; */ public class DemoModeException extends RuntimeException { - private static final long serialVersionUID = 1L; + public DemoModeException() { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileException.java index 29c085e..3657c65 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileException.java @@ -9,7 +9,7 @@ import com.hchyun.common.exception.BaseException; */ public class FileException extends BaseException { - private static final long serialVersionUID = 1L; + public FileException(String code, Object[] args) { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileNameLengthLimitExceededException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileNameLengthLimitExceededException.java index a659553..901d5cc 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileNameLengthLimitExceededException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileNameLengthLimitExceededException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.file; */ public class FileNameLengthLimitExceededException extends FileException { - private static final long serialVersionUID = 1L; + public FileNameLengthLimitExceededException(int defaultFileNameLength) { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileSizeLimitExceededException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileSizeLimitExceededException.java index bc08aa5..fad80f1 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileSizeLimitExceededException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/FileSizeLimitExceededException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.file; */ public class FileSizeLimitExceededException extends FileException { - private static final long serialVersionUID = 1L; + public FileSizeLimitExceededException(long defaultMaxSize) { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/InvalidExtensionException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/InvalidExtensionException.java index f2973e9..58d75fb 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/InvalidExtensionException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/file/InvalidExtensionException.java @@ -10,7 +10,7 @@ import org.apache.commons.fileupload.FileUploadException; */ public class InvalidExtensionException extends FileUploadException { - private static final long serialVersionUID = 1L; + private String[] allowedExtension; private String extension; @@ -41,7 +41,7 @@ public class InvalidExtensionException extends FileUploadException public static class InvalidImageExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) { @@ -51,7 +51,7 @@ public class InvalidExtensionException extends FileUploadException public static class InvalidFlashExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) { @@ -61,7 +61,7 @@ public class InvalidExtensionException extends FileUploadException public static class InvalidMediaExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/job/TaskException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/job/TaskException.java index ac308cf..b55c096 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/job/TaskException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/job/TaskException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.job; */ public class TaskException extends Exception { - private static final long serialVersionUID = 1L; + private Code code; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaException.java index d235f7c..49c9054 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.user; */ public class CaptchaException extends UserException { - private static final long serialVersionUID = 1L; + public CaptchaException() { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaExpireException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaExpireException.java index e1d45d8..2a029e3 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaExpireException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/CaptchaExpireException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.user; */ public class CaptchaExpireException extends UserException { - private static final long serialVersionUID = 1L; + public CaptchaExpireException() { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserException.java index 4d336ff..05286c5 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserException.java @@ -9,7 +9,7 @@ import com.hchyun.common.exception.BaseException; */ public class UserException extends BaseException { - private static final long serialVersionUID = 1L; + public UserException(String code, Object[] args) { diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserPasswordNotMatchException.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserPasswordNotMatchException.java index ec7251e..cf59fad 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserPasswordNotMatchException.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/exception/user/UserPasswordNotMatchException.java @@ -7,7 +7,7 @@ package com.hchyun.common.exception.user; */ public class UserPasswordNotMatchException extends UserException { - private static final long serialVersionUID = 1L; + public UserPasswordNotMatchException() { diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java index 668ebd2..eb90365 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java @@ -13,6 +13,9 @@ import com.hchyun.common.utils.sql.SqlUtil; import com.hchyun.generator.entity.UniCon; import com.hchyun.generator.entity.UniQuery; import com.hchyun.generator.service.QueryService; +import com.hchyun.generator.service.UniQueryService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -32,28 +35,46 @@ import java.util.Map; * @Version 1.0 */ @RestController +@Api("query") @RequestMapping("/query") public class QueryController extends BaseController { protected final Logger logger = LoggerFactory.getLogger(QueryController.class); - @Autowired private QueryService queryService; + @Autowired + private UniQueryService uniQueryService; - @PreAuthorize("@ss.hasPermi('query:list')") - @GetMapping("/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id){ + + @ApiOperation("获取查询基本信息") + @PreAuthorize("@ss.hasPermi('query:real:list')") + @GetMapping("/real/{id}") + public AjaxResult getRealInfo(@PathVariable("id") Long id) { try { - ServerResult serverResult = queryService.selectQueryById(id); + if (id == null) { + return AjaxResult.error("id不能为空!"); + } + ServerResult> serverResult = queryService.getRealInfo(id); + if (serverResult.isStart()) { + return AjaxResult.success(serverResult.getData()); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } + + + @PreAuthorize("@ss.hasAnyPermi('query:real:data')") + @PutMapping("/real") + public Serializable getRealData(@Validated @RequestBody UniQuery uniQuery){ + try { + ServerResult>> serverResult = queryService.getRealData(uniQuery); if (serverResult.isStart()){ - UniQuery uniQuery = serverResult.getData(); - Map modeMap = new HashMap(); - List uniCons = uniQuery.getUniCons(); - uniQuery.setUniCons(null); - modeMap.put("info",uniQuery); - modeMap.put("list",uniCons); - return AjaxResult.success(modeMap); + return getDataTable(serverResult.getData()); }else { return AjaxResult.error(serverResult.getMsg()); } @@ -62,6 +83,29 @@ public class QueryController extends BaseController { return AjaxResult.error(ReturnConstants.SYS_ERROR); } } + + + @PreAuthorize("@ss.hasPermi('query:list')") + @GetMapping("/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + try { + ServerResult serverResult = queryService.selectQueryById(id); + if (serverResult.isStart()) { + UniQuery uniQuery = serverResult.getData(); + Map modeMap = new HashMap(); + List uniCons = uniQuery.getUniCons(); + uniQuery.setUniCons(null); + modeMap.put("info", uniQuery); + modeMap.put("list", uniCons); + return AjaxResult.success(modeMap); + } else { + return AjaxResult.error(serverResult.getMsg()); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return AjaxResult.error(ReturnConstants.SYS_ERROR); + } + } // @PreAuthorize("@ss.hasPermi('query:list')") // @GetMapping("/list") // public AjaxResult list(UniQuery uniQuery){ @@ -75,15 +119,15 @@ public class QueryController extends BaseController { @PreAuthorize("@ss.hasPermi('query:edit')") @PutMapping - public AjaxResult edit(@Validated @RequestBody UniQuery uniQuery){ + public AjaxResult edit(@Validated @RequestBody UniQuery uniQuery) { try { ServerResult serverResult = queryService.updateQueryInfo(uniQuery); - if (serverResult.isStart()){ + if (serverResult.isStart()) { return AjaxResult.success(); - }else { + } else { return AjaxResult.error(serverResult.getMsg()); } - }catch (RuntimeException e){ + } catch (RuntimeException e) { logger.error(e.getMessage()); return AjaxResult.error(ReturnConstants.SYS_ERROR); } @@ -91,30 +135,32 @@ public class QueryController extends BaseController { @PreAuthorize("@ss.hasPermi('query:preview')") @PutMapping("preview") - public Serializable Preview(@Validated @RequestBody UniQuery uniQuery){ + public Serializable Preview(@Validated @RequestBody UniQuery uniQuery) { try { startPage(uniQuery); - ServerResult>> serverResult = queryService.previewQuery(uniQuery); - if (serverResult.isStart()){ + ServerResult>> serverResult = queryService.previewQuery(uniQuery); + if (serverResult.isStart()) { return getDataTable(serverResult.getData()); - }else { + } else { return AjaxResult.error(serverResult.getMsg()); } - }catch (RuntimeException e){ + } catch (RuntimeException e) { logger.error(e.getMessage()); return AjaxResult.error(ReturnConstants.SYS_ERROR); } } + @PreAuthorize("@ss.hasPermi('query:edit')") @GetMapping("/export/{id}") - public AjaxResult Export(@PathVariable("id") Long id){ + public AjaxResult Export(@PathVariable("id") Long id) { try { return AjaxResult.success(); - }catch (RuntimeException e){ + } catch (RuntimeException e) { logger.error(e.getMessage()); return AjaxResult.error(ReturnConstants.SYS_ERROR); } } + /** * 设置请求分页数据 */ diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/QueryDao.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/QueryDao.java index 5ab29ff..8506320 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/QueryDao.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/QueryDao.java @@ -23,4 +23,7 @@ public interface QueryDao { Integer insertUniCon(List uniCons); List> UniQuery(String paramSQL); + + List queryRealInfo(Long id); + } diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Apiclass.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Apiclass.java index e499f96..01cbd6e 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Apiclass.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Apiclass.java @@ -17,7 +17,7 @@ import java.util.List; */ @ApiModel("接口类名") public class Apiclass extends BaseEntity { - private static final long serialVersionUID = 1L; + /** * 类id diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java index 7588ea5..117d635 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java @@ -15,7 +15,7 @@ import com.hchyun.common.utils.StringUtils; */ public class GenTable extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 编号 */ private Long tableId; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java index 04c5243..1083f5d 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java @@ -11,7 +11,7 @@ import com.hchyun.common.utils.StringUtils; */ public class GenTableColumn extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 编号 */ private Long columnId; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Module.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Module.java index c90bfc6..f5586de 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Module.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/Module.java @@ -14,7 +14,7 @@ import java.util.List; * @date 2021-01-24 */ public class Module extends BaseEntity { - private static final long serialVersionUID = 1L; + /** * 模块id diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniCon.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniCon.java index 84d3e3f..a3edc80 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniCon.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniCon.java @@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2021-01-30 */ public class UniCon { - private static final long serialVersionUID = 1L; + /** * id @@ -43,6 +43,11 @@ public class UniCon { */ private String ucMock; + /** + * 真实数据 + */ + private String ucReal; + /** * 描述 */ @@ -125,4 +130,12 @@ public class UniCon { public void setUcDescribe(String ucDescribe) { this.ucDescribe = ucDescribe; } + + public String getUcReal() { + return ucReal; + } + + public void setUcReal(String ucReal) { + this.ucReal = ucReal; + } } \ No newline at end of file diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniQuery.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniQuery.java index acf9f64..5bea36a 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniQuery.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/UniQuery.java @@ -4,6 +4,7 @@ import com.hchyun.common.core.entity.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.ArrayList; import java.util.List; /** @@ -13,7 +14,6 @@ import java.util.List; * @date 2021-01-30 */ public class UniQuery extends BaseEntity { - private static final long serialVersionUID = 1L; /** * id @@ -35,12 +35,26 @@ public class UniQuery extends BaseEntity { */ private String uqDescribe; + /** + * 是否发布(0:否,1:发布) + */ + private Integer isRelease; + private List uniCons; private Integer pageNum; private Integer pageSize; + + public Integer getIsRelease() { + return isRelease; + } + + public void setIsRelease(Integer isRelease) { + this.isRelease = isRelease; + } + public Integer getPageNum() { return pageNum; } @@ -58,11 +72,15 @@ public class UniQuery extends BaseEntity { } public List getUniCons() { - return uniCons; + if (uniCons == null){ + return uniCons = new ArrayList(); + }else { + return uniCons; + } } public void setUniCons(List uniCons) { - this.uniCons = uniCons; + this.uniCons = uniCons; } public void setId(Long id) { diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/QueryService.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/QueryService.java index b035f67..156c3eb 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/QueryService.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/QueryService.java @@ -1,6 +1,7 @@ package com.hchyun.generator.service; import com.hchyun.common.utils.ServerResult; +import com.hchyun.generator.entity.UniCon; import com.hchyun.generator.entity.UniQuery; import java.util.List; @@ -32,4 +33,18 @@ public interface QueryService { * @return */ ServerResult>> previewQuery(UniQuery uniQuery); + + /** + * 获取真实查询基本信息 + * @param id + * @return + */ + ServerResult> getRealInfo(Long id); + + /** + * 获取查询信息 + * @param uniQuery + * @return + */ + ServerResult>> getRealData(UniQuery uniQuery); } diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java index 85ed785..fc128a0 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java @@ -1,6 +1,7 @@ package com.hchyun.generator.service.impl; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.utils.DateUtils; import com.hchyun.common.utils.ServerResult; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.List; +import java.util.Locale; import java.util.Map; /** @@ -27,13 +29,16 @@ import java.util.Map; @Service public class QueryServiceImpl implements QueryService { private Logger logger = LoggerFactory.getLogger(QueryServiceImpl.class); + @Autowired private QueryDao queryDao; + @Autowired private UniQueryDao uniQueryDao; /** * 查询万能查询的基本信息和条件信息 + * * @param id * @return */ @@ -46,15 +51,44 @@ public class QueryServiceImpl implements QueryService { } else { return new ServerResult(false, ReturnConstants.RESULT_EMPTY); } - } catch (RuntimeException e) { logger.error(e.getMessage()); return new ServerResult(false, ReturnConstants.SYS_FAILL); } } + @Override + public ServerResult>> getRealData(UniQuery uniQuery) { + try { + List uniCons = uniQuery.getUniCons(); + Integer pageNum = uniQuery.getPageNum(); + Integer pageSize = uniQuery.getPageSize(); + uniQuery = uniQueryDao.selectUniQueryById(uniQuery.getId()); + String sql = uniQuery.getUqSql().toLowerCase(); + sql = sql.toLowerCase(); + if (uniQuery.getIsRelease() == 0) { + return new ServerResult>>(false, ReturnConstants.STATE_ERROR); + } else { + if (uniCons.size() > 0) { + sql += " where "; + for (UniCon uniCon : uniCons) { + sql += conversionReal(uniCon); + } + sql+= " 1 = 1"; + } + PageHelper.startPage(pageNum, pageSize, ""); + List> dataMap = queryDao.UniQuery(sql); + return new ServerResult>>(true, dataMap); + } + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return new ServerResult>>(false, ReturnConstants.SYS_FAILL); + } + } + /** * 更新万能查询基本信息和条件 + * * @param uniQuery * @return */ @@ -64,16 +98,16 @@ public class QueryServiceImpl implements QueryService { try { Integer uqrenewal = uniQueryDao.updateUniQuery(uniQuery); if (uqrenewal > 0) { - if (uniQuery.getUniCons()!=null){ + if (uniQuery.getUniCons() != null) { queryDao.deleteUniCon(uniQuery.getId()); Integer ucrenewal = queryDao.insertUniCon(uniQuery.getUniCons()); - if (ucrenewal==0){ - return new ServerResult(false,"操作失败!"); + if (ucrenewal == 0) { + return new ServerResult(false, "操作失败!"); } } return new ServerResult(true); } - return new ServerResult(false,"操作失败!"); + return new ServerResult(false, "操作失败!"); } catch (RuntimeException e) { logger.error(e.getMessage()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); @@ -82,68 +116,113 @@ public class QueryServiceImpl implements QueryService { } @Override - public ServerResult>> previewQuery(UniQuery uniQuery) { + public ServerResult>> previewQuery(UniQuery uniQuery) { try { String sql = uniQuery.getUqSql(); List uniConList = uniQuery.getUniCons(); sql = sql.toLowerCase(); - if (sql.contains("insert")||sql.contains("delete ")||sql.contains("update ")||sql.contains("drop ")||sql.contains("database ")||sql.contains("create ")||sql.contains("view ")||sql.contains("alter ")){ - return new ServerResult>>(false,"sql语句含有insert,delete,update,drop,database,view,alter等特殊字符!"); + if (sql.contains("insert") || sql.contains("delete ") || sql.contains("update ") || sql.contains("drop ") || sql.contains("database ") || sql.contains("create ") || sql.contains("view ") || sql.contains("alter ")) { + return new ServerResult>>(false, "sql语句含有insert,delete,update,drop,database,view,alter等特殊字符!"); } - sql = sql + " where "; - if(uniConList!=null){ - for (UniCon uniCon: uniConList) { - - sql += conversion(uniCon); + if (uniConList.size() > 0) { + sql = sql + " where "; + for (UniCon uniCon : uniConList) { + sql += conversionPreview(uniCon); } - sql = sql + " 1=1"; + sql+= " 1 = 1"; } - - List> dataMap = queryDao.UniQuery(sql); - - return new ServerResult>>(true,dataMap); - }catch (RuntimeException e){ + List> dataMap = queryDao.UniQuery(sql); + return new ServerResult>>(true, dataMap); + } catch (RuntimeException e) { logger.error(e.getMessage()); - return new ServerResult>>(false,e.getMessage()); + return new ServerResult>>(false, e.getMessage()); + } + } + + @Override + public ServerResult> getRealInfo(Long id) { + try { + List uniCons = queryDao.queryRealInfo(id); + return new ServerResult>(true, uniCons); + } catch (RuntimeException e) { + logger.error(e.getMessage()); + return new ServerResult>(false, ReturnConstants.DB_EX); } } - public String conversion(UniCon uniCon){ - if (uniCon.getType().equals("datetime")){ + public String conversionReal(UniCon uniCon) { + if (uniCon.getUcReal() == null) { + return ""; + } else { + if (uniCon.getUcType().equals("datetime")) { + uniCon.setUcReal(DateUtils.getDate(uniCon.getUcReal())); + } + String sql = ""; + if (uniCon.getUcCon().equals("EQ")) { + sql += uniCon.getUcKey() + " = '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("NE")) { + sql += uniCon.getUcKey() + " != '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("GT")) { + sql += uniCon.getUcKey() + " > '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("GTE")) { + sql += uniCon.getUcKey() + " >= '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("LT")) { + sql += uniCon.getUcKey() + " < '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("LTE")) { + sql += uniCon.getUcKey() + " <= '" + uniCon.getUcReal() + "' and "; + } else if (uniCon.getUcCon().equals("LIKE")) { + sql += uniCon.getUcKey() + " like '%" + uniCon.getUcReal() + "%'"; + } else if (uniCon.getUcCon().equals("BETWEEN")) { + JSONObject jsonObject = JSONObject.parseObject(uniCon.getUcReal()); + if (uniCon.getUcType().equals("input")) { + Object begin = jsonObject.get("begin"); + Object end = jsonObject.get("end"); + sql += uniCon.getUcKey() + " between '" + begin + "' AND '" + end + "' and "; + } else if (uniCon.getUcType().equals("datetime")) { + Object startTime = jsonObject.get("startTime"); + Object endTime = jsonObject.get("endTime"); + sql += uniCon.getUcKey() + " between '" + startTime + "' AND '" + endTime + "' and "; + } + } + return sql; + + } + } + + public String conversionPreview(UniCon uniCon) { + if (uniCon.getType().equals("datetime")) { uniCon.setUcMock(DateUtils.getDate(uniCon.getUcMock())); } String sql = ""; - if (uniCon.getUcCon().equals("EQ")){ - sql += uniCon.getUcKey() + " = '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("NE")){ - sql += uniCon.getUcKey() + " != '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("GT")){ - sql += uniCon.getUcKey() + " > '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("GTE")){ - sql += uniCon.getUcKey() + " >= '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("LT")){ - sql += uniCon.getUcKey() + " < '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("LTE")){ - sql += uniCon.getUcKey() + " <= '" + uniCon.getUcMock()+ "' and "; - }else if (uniCon.getUcCon().equals("LIKE")){ - sql += uniCon.getUcKey() + " like '%" + uniCon.getUcMock()+ "%' and "; - }else if (uniCon.getUcCon().equals("BETWEEN")){ + if (uniCon.getUcCon().equals("EQ")) { + sql += uniCon.getUcKey() + " = '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("NE")) { + sql += uniCon.getUcKey() + " != '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("GT")) { + sql += uniCon.getUcKey() + " > '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("GTE")) { + sql += uniCon.getUcKey() + " >= '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("LT")) { + sql += uniCon.getUcKey() + " < '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("LTE")) { + sql += uniCon.getUcKey() + " <= '" + uniCon.getUcMock() + "' and "; + } else if (uniCon.getUcCon().equals("LIKE")) { + sql += uniCon.getUcKey() + " like '%" + uniCon.getUcMock() + "%'"; + } else if (uniCon.getUcCon().equals("BETWEEN")) { JSONObject jsonObject = JSONObject.parseObject(uniCon.getUcMock()); - if (uniCon.getUcType().equals("input")){ + if (uniCon.getUcType().equals("input")) { Object begin = jsonObject.get("begin"); Object end = jsonObject.get("end"); - sql += uniCon.getUcKey() + " between '" + begin +"' AND '" + end + "' and"; - }else if (uniCon.getUcType().equals("datetime")){ + sql += uniCon.getUcKey() + " between '" + begin + "' AND '" + end + "' and "; + } else if (uniCon.getUcType().equals("datetime")) { Object startTime = jsonObject.get("startTime"); Object endTime = jsonObject.get("endTime"); - sql += uniCon.getUcKey() + " between '" + startTime +"' AND '" + endTime + "' and"; + sql += uniCon.getUcKey() + " between '" + startTime + "' AND '" + endTime + "' and "; } } return sql; } - - } diff --git a/hchyun/hchyun-generator/src/main/resources/mapper/generator/QueryMapper.xml b/hchyun/hchyun-generator/src/main/resources/mapper/generator/QueryMapper.xml index ee37d7c..8f25e45 100644 --- a/hchyun/hchyun-generator/src/main/resources/mapper/generator/QueryMapper.xml +++ b/hchyun/hchyun-generator/src/main/resources/mapper/generator/QueryMapper.xml @@ -31,6 +31,10 @@ + + diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java index f767097..b53d88d 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java @@ -21,7 +21,7 @@ import com.hchyun.quartz.util.CronUtils; */ public class SysJob extends BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; + /** 任务ID */ @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java index 57d3dbe..1941524 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java @@ -13,7 +13,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysJobLog extends BaseEntity { - private static final long serialVersionUID = 1L; + /** ID */ @Excel(name = "日志序号") diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java index 4b737d4..96ee3e8 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; */ public class Regular extends BaseEntity { - private static final long serialVersionUID = 1L; + /** id */ private Long id; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java index d03e6c3..6e211c8 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java @@ -15,7 +15,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysConfig extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 参数主键 */ @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java index 5436dff..af6ff1f 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java @@ -13,7 +13,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysLogininfor extends BaseEntity { - private static final long serialVersionUID = 1L; + /** ID */ @Excel(name = "序号", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java index 8a8a864..738cc79 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java @@ -13,7 +13,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysNotice extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 公告ID */ private Long noticeId; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java index 0e89127..b8c3dfc 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java @@ -13,7 +13,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysOperLog extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 日志主键 */ @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java index 9adfbb6..a0a6098 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java @@ -15,7 +15,7 @@ import com.hchyun.common.core.entity.BaseEntity; */ public class SysPost extends BaseEntity { - private static final long serialVersionUID = 1L; + /** 岗位序号 */ @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java index 7ed20c4..753fe37 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Results.java @@ -16,7 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @ApiModel("成绩") public class Results extends BaseEntity { - private static final long serialVersionUID = 1L; + /** id */ @ApiModelProperty("id") diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java index d6d3b6a..ab5b546 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/Stu.java @@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; */ public class Stu extends BaseEntity { - private static final long serialVersionUID = 1L; + /** id */ private Long id; diff --git a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/TestTree.java b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/TestTree.java index 26ff3a4..aa95585 100644 --- a/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/TestTree.java +++ b/hchyun/hchyun-test/src/main/java/com/hchyun/test/entity/TestTree.java @@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; */ public class TestTree extends TreeEntity { - private static final long serialVersionUID = 1L; + /** 主键id */ private Long id;