diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java index 4d5e32dc..f4066e5a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java @@ -6,13 +6,13 @@ import ${domain}.frame.excel.annotation.ExcelNote; import ${domain}.frame.excel.annotation.ExcelSheet; /** - * LOGERR - 错误日志 + * LOGERR - 故障日志 * * @author wangbing * @version 0.0.1 * @since 2020-07-06 */ -@ExcelSheet("错误日志") +@ExcelSheet("故障日志") public class Logerr extends BaseEntity { /** diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java index c282c05b..b74554ce 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java @@ -11,7 +11,7 @@ import ${domain}.module.wsys.rsp.LogerrFindResponse; import ${domain}.module.wsys.rsp.LogerrUpdateResponse; /** - * 错误日志 + * 故障日志 * * @author wangbing * @version 0.0.1 @@ -56,7 +56,7 @@ public interface LogerrManager { LogerrFindResponse find(LogerrFindRequest request, Token token); /** - * 快速添加错误日志 + * 快速添加故障日志 * * @param logType 日志类型 * @param logTitle 标题 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java index 16d8d8ff..440c83b1 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java @@ -25,7 +25,7 @@ import ${domain}.module.wsys.rsp.LogerrFindResponse; import ${domain}.module.wsys.rsp.LogerrUpdateResponse; /** - * LOGERR - 错误日志 + * LOGERR - 故障日志 * * @author wangbing * @version 0.0.1 @@ -155,7 +155,7 @@ public class LogerrManagerImpl implements LogerrManager { } /** - * 快速添加错误日志 + * 快速添加故障日志 * * @param logType 日志类型 * @param logTitle 标题 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java index 88d6862b..7761b499 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java @@ -9,7 +9,7 @@ import ${domain}.module.wsys.req.LogerrFindRequest; import java.util.List; /** - * LOGERR - 错误日志 + * LOGERR - 故障日志 * * @author wangbing * @since 2020-07-06 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java index 5d17ed99..6ee4d795 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** - * LogerrCreateRequest - 错误日志新增 + * LogerrCreateRequest - 故障日志新增 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java index 2f696b2e..5dcd61cd 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java @@ -5,7 +5,7 @@ import ${domain}.frame.base.BaseRequest; import javax.validation.constraints.NotNull; /** - * LogerrDeleteRequest - 错误日志删除 + * LogerrDeleteRequest - 故障日志删除 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java index 72f74921..80d47954 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java @@ -6,7 +6,7 @@ import ${domain}.frame.validation.Select; import java.util.Date; /** - * LogerrFindRequest - 错误日志查询 + * LogerrFindRequest - 故障日志查询 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java index b17010d0..c8f597a3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** - * LogerrUpdateRequest - 错误日志更新 + * LogerrUpdateRequest - 故障日志更新 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java index 186529d4..50f82e8d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java @@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp; import ${domain}.frame.base.BaseResponse; /** - * LogerrCreateResponse - 错误日志 + * LogerrCreateResponse - 故障日志 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java index 89c072fa..b1fdebbe 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java @@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp; import ${domain}.frame.base.BaseResponse; /** - * LogerrDeleteResponse - 错误日志 + * LogerrDeleteResponse - 故障日志 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java index f429b8a0..835f5578 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java @@ -4,7 +4,7 @@ import ${domain}.frame.base.BaseFindResponse; import ${domain}.module.wsys.ent.Logerr; /** - * LogerrFindResponse - 错误日志 + * LogerrFindResponse - 故障日志 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java index 1059f07a..610cd9ad 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java @@ -3,7 +3,7 @@ package ${domain}.module.wsys.rsp; import ${domain}.frame.base.BaseResponse; /** - * LogerrUpdateResponse - 错误日志 + * LogerrUpdateResponse - 故障日志 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml index 97b5dfbc..f09d06d7 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml @@ -230,7 +230,7 @@ - +
diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql index fb54d4cf..cf0270cd 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql @@ -318,7 +318,7 @@ PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='序列'; -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : MySQL -- Author : wangbing -- Date: : 2020-07-11 @@ -336,7 +336,7 @@ CREATE TABLE `SYS_LOGERR` ( `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障日志'; -- ---------------------------- -- Table structure for PROFILES - 系统配置 diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_LOGERR.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_LOGERR.sql index 686f353a..59cf9492 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_LOGERR.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_LOGERR.sql @@ -1,5 +1,5 @@ -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : MySQL -- Author : wangbing -- Date: : 2020-07-11 @@ -17,4 +17,4 @@ CREATE TABLE `SYS_LOGERR` ( `LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户', `LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障日志'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql index 4a7fe68c..05a7b445 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql @@ -499,7 +499,7 @@ COMMENT ON COLUMN "SYS_SEQUENCE"."LAST_UPDATE_BY" is '最后更新用户'; COMMENT ON COLUMN "SYS_SEQUENCE"."LAST_UPDATE_TIME" is '最后更新时间'; -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : Oracle -- Author : wangbing -- Date: : 2020-07-11 @@ -517,7 +517,7 @@ CREATE TABLE "SYS_LOGERR" ( "LAST_UPDATE_BY" NUMBER(19) NULL, "LAST_UPDATE_TIME" DATE NULL ); -COMMENT ON TABLE "SYS_LOGERR" is '错误日志'; +COMMENT ON TABLE "SYS_LOGERR" is '故障日志'; COMMENT ON COLUMN "SYS_LOGERR"."ID" is '主键'; COMMENT ON COLUMN "SYS_LOGERR"."LOG_TYPE" is '日志类型'; COMMENT ON COLUMN "SYS_LOGERR"."LOG_TITLE" is '任务标题'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_LOGERR.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_LOGERR.sql index 39808ad0..d97b83cc 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_LOGERR.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_LOGERR.sql @@ -1,5 +1,5 @@ -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : Oracle -- Author : wangbing -- Date: : 2020-07-11 @@ -18,7 +18,7 @@ CREATE TABLE "SYS_LOGERR" ( "LAST_UPDATE_TIME" DATE NULL ); -COMMENT ON TABLE "SYS_LOGERR" is '错误日志'; +COMMENT ON TABLE "SYS_LOGERR" is '故障日志'; COMMENT ON COLUMN "SYS_LOGERR"."ID" is '主键'; COMMENT ON COLUMN "SYS_LOGERR"."LOG_TYPE" is '日志类型'; COMMENT ON COLUMN "SYS_LOGERR"."LOG_TITLE" is '任务标题'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql index 538e7379..866c543f 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql @@ -302,7 +302,7 @@ CREATE TABLE IF NOT EXISTS SYS_VISITOR_RES ( ); -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : SQLite -- Author : wangbing -- Date: : 2020-09-04 diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_LOGERR.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_LOGERR.sql index 7ff22f9a..e7b2d70d 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_LOGERR.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_LOGERR.sql @@ -1,5 +1,5 @@ -- ---------------------------- --- Table structure for LOGERR - 错误日志 +-- Table structure for LOGERR - 故障日志 -- Target : SQLite -- Author : wangbing -- Date: : 2020-07-06 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl index 6efc668b..a976f49d 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl @@ -11,24 +11,11 @@ p-id="2846" fill="#ffffff"> 3300 - 用户总数 + 用户人数
- - - - 3300 - 活跃用户 -
-
- - 在线人数
- - + + 3300 - 登录总数 + 部门总数
@@ -59,16 +41,25 @@ p-id="4248" fill="#ffffff"> 3300 + 故障未处理 +
+
+ + + + 3300 故障总数
-
-
+
-
+
-
+