wms / wms4_shenzhenxinyi · Commits

Commit 75945d80704854404ae190da592a7db23857ca15

Authored by Bobo
Committed by JEECG开源社区
1 parent e599229f

!6 fix 数据字典导出500错误 

* update git ignore
* fix 数据字典导出 1 表名大写改小写 SYS_DICT_ITEM 2 增加导出数据排序
* fix QRTZ with upper case
* add git ignore
Inline Side-by-side
Showing 3 changed files with 39 additions and 29 deletions
.gitignore 0 → 100644
  View file @75945d8
  1 +## ide
  2 +**/.idea
  3 +*.iml
  4 +
  5 +## backend
  6 +**/target
  7 +**/logs
  8 +
  9 +## front
  10 +**/*.lock
... ...
jeecg-boot/db/mysql-5.7.sql
  View file @75945d8
... ... @@ -1097,21 +1097,21 @@ CREATE TABLE `oss_file` (
1097 1097 -- ----------------------------
1098 1098 -- Table structure for qrtz_blob_triggers
1099 1099 -- ----------------------------
1100   -DROP TABLE IF EXISTS `qrtz_blob_triggers`;
1101   -CREATE TABLE `qrtz_blob_triggers` (
  1100 +DROP TABLE IF EXISTS `QRTZ_BLOB_TRIGGERS`;
  1101 +CREATE TABLE `QRTZ_BLOB_TRIGGERS` (
1102 1102 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1103 1103 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1104 1104 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1105 1105 `BLOB_DATA` blob NULL,
1106 1106 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
1107   - CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
  1107 + CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
1108 1108 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE' ROW_FORMAT = Dynamic;
1109 1109  
1110 1110 -- ----------------------------
1111 1111 -- Table structure for qrtz_calendars
1112 1112 -- ----------------------------
1113   -DROP TABLE IF EXISTS `qrtz_calendars`;
1114   -CREATE TABLE `qrtz_calendars` (
  1113 +DROP TABLE IF EXISTS `QRTZ_CALENDARS`;
  1114 +CREATE TABLE `QRTZ_CALENDARS` (
1115 1115 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1116 1116 `CALENDAR_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1117 1117 `CALENDAR` blob NOT NULL,
... ... @@ -1121,22 +1121,22 @@ CREATE TABLE `qrtz_calendars` (
1121 1121 -- ----------------------------
1122 1122 -- Table structure for qrtz_cron_triggers
1123 1123 -- ----------------------------
1124   -DROP TABLE IF EXISTS `qrtz_cron_triggers`;
1125   -CREATE TABLE `qrtz_cron_triggers` (
  1124 +DROP TABLE IF EXISTS `QRTZ_CRON_TRIGGERS`;
  1125 +CREATE TABLE `QRTZ_CRON_TRIGGERS` (
1126 1126 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1127 1127 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1128 1128 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1129 1129 `CRON_EXPRESSION` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1130 1130 `TIME_ZONE_ID` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1131 1131 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
1132   - CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
  1132 + CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
1133 1133 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE' ROW_FORMAT = Dynamic;
1134 1134  
1135 1135 -- ----------------------------
1136 1136 -- Table structure for qrtz_fired_triggers
1137 1137 -- ----------------------------
1138   -DROP TABLE IF EXISTS `qrtz_fired_triggers`;
1139   -CREATE TABLE `qrtz_fired_triggers` (
  1138 +DROP TABLE IF EXISTS `QRTZ_FIRED_TRIGGERS`;
  1139 +CREATE TABLE `QRTZ_FIRED_TRIGGERS` (
1140 1140 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1141 1141 `ENTRY_ID` varchar(95) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1142 1142 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
... ... @@ -1156,8 +1156,8 @@ CREATE TABLE `qrtz_fired_triggers` (
1156 1156 -- ----------------------------
1157 1157 -- Table structure for qrtz_job_details
1158 1158 -- ----------------------------
1159   -DROP TABLE IF EXISTS `qrtz_job_details`;
1160   -CREATE TABLE `qrtz_job_details` (
  1159 +DROP TABLE IF EXISTS `QRTZ_JOB_DETAILS`;
  1160 +CREATE TABLE `QRTZ_JOB_DETAILS` (
1161 1161 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1162 1162 `JOB_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1163 1163 `JOB_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
... ... @@ -1174,8 +1174,8 @@ CREATE TABLE `qrtz_job_details` (
1174 1174 -- ----------------------------
1175 1175 -- Table structure for qrtz_locks
1176 1176 -- ----------------------------
1177   -DROP TABLE IF EXISTS `qrtz_locks`;
1178   -CREATE TABLE `qrtz_locks` (
  1177 +DROP TABLE IF EXISTS `QRTZ_LOCKS`;
  1178 +CREATE TABLE `QRTZ_LOCKS` (
1179 1179 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1180 1180 `LOCK_NAME` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1181 1181 PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE
... ... @@ -1184,13 +1184,13 @@ CREATE TABLE `qrtz_locks` (
1184 1184 -- ----------------------------
1185 1185 -- Records of qrtz_locks
1186 1186 -- ----------------------------
1187   -INSERT INTO `qrtz_locks` VALUES ('quartzScheduler', 'TRIGGER_ACCESS');
  1187 +INSERT INTO `QRTZ_LOCKS` VALUES ('quartzScheduler', 'TRIGGER_ACCESS');
1188 1188  
1189 1189 -- ----------------------------
1190 1190 -- Table structure for qrtz_paused_trigger_grps
1191 1191 -- ----------------------------
1192   -DROP TABLE IF EXISTS `qrtz_paused_trigger_grps`;
1193   -CREATE TABLE `qrtz_paused_trigger_grps` (
  1192 +DROP TABLE IF EXISTS `QRTZ_PAUSED_TRIGGER_GRPS`;
  1193 +CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS` (
1194 1194 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1195 1195 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1196 1196 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE
... ... @@ -1199,8 +1199,8 @@ CREATE TABLE `qrtz_paused_trigger_grps` (
1199 1199 -- ----------------------------
1200 1200 -- Table structure for qrtz_scheduler_state
1201 1201 -- ----------------------------
1202   -DROP TABLE IF EXISTS `qrtz_scheduler_state`;
1203   -CREATE TABLE `qrtz_scheduler_state` (
  1202 +DROP TABLE IF EXISTS `QRTZ_SCHEDULER_STATE`;
  1203 +CREATE TABLE `QRTZ_SCHEDULER_STATE` (
1204 1204 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1205 1205 `INSTANCE_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1206 1206 `LAST_CHECKIN_TIME` bigint(13) NOT NULL,
... ... @@ -1211,8 +1211,8 @@ CREATE TABLE `qrtz_scheduler_state` (
1211 1211 -- ----------------------------
1212 1212 -- Table structure for qrtz_simple_triggers
1213 1213 -- ----------------------------
1214   -DROP TABLE IF EXISTS `qrtz_simple_triggers`;
1215   -CREATE TABLE `qrtz_simple_triggers` (
  1214 +DROP TABLE IF EXISTS `QRTZ_SIMPLE_TRIGGERS`;
  1215 +CREATE TABLE `QRTZ_SIMPLE_TRIGGERS` (
1216 1216 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1217 1217 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1218 1218 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
... ... @@ -1220,14 +1220,14 @@ CREATE TABLE `qrtz_simple_triggers` (
1220 1220 `REPEAT_INTERVAL` bigint(12) NOT NULL,
1221 1221 `TIMES_TRIGGERED` bigint(10) NOT NULL,
1222 1222 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
1223   - CONSTRAINT `qrtz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
  1223 + CONSTRAINT `qrtz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
1224 1224 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE' ROW_FORMAT = Dynamic;
1225 1225  
1226 1226 -- ----------------------------
1227 1227 -- Table structure for qrtz_simprop_triggers
1228 1228 -- ----------------------------
1229   -DROP TABLE IF EXISTS `qrtz_simprop_triggers`;
1230   -CREATE TABLE `qrtz_simprop_triggers` (
  1229 +DROP TABLE IF EXISTS `QRTZ_SIMPROP_TRIGGERS`;
  1230 +CREATE TABLE `QRTZ_SIMPROP_TRIGGERS` (
1231 1231 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1232 1232 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1233 1233 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
... ... @@ -1243,14 +1243,14 @@ CREATE TABLE `qrtz_simprop_triggers` (
1243 1243 `BOOL_PROP_1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1244 1244 `BOOL_PROP_2` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1245 1245 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
1246   - CONSTRAINT `qrtz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
  1246 + CONSTRAINT `qrtz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
1247 1247 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'InnoDB free: 504832 kB; (`SCHED_NAME` `TRIGGER_NAME` `TRIGGE' ROW_FORMAT = Dynamic;
1248 1248  
1249 1249 -- ----------------------------
1250 1250 -- Table structure for qrtz_triggers
1251 1251 -- ----------------------------
1252   -DROP TABLE IF EXISTS `qrtz_triggers`;
1253   -CREATE TABLE `qrtz_triggers` (
  1252 +DROP TABLE IF EXISTS `QRTZ_TRIGGERS`;
  1253 +CREATE TABLE `QRTZ_TRIGGERS` (
1254 1254 `SCHED_NAME` varchar(120) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1255 1255 `TRIGGER_NAME` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
1256 1256 `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
... ... @@ -1269,7 +1269,7 @@ CREATE TABLE `qrtz_triggers` (
1269 1269 `JOB_DATA` blob NULL,
1270 1270 PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
1271 1271 INDEX `SCHED_NAME`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE,
1272   - CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `qrtz_job_details` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
  1272 + CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `QRTZ_JOB_DETAILS` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
1273 1273 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'InnoDB free: 504832 kB; (`SCHED_NAME` `JOB_NAME` `JOB_GROUP`' ROW_FORMAT = Dynamic;
1274 1274  
1275 1275 -- ----------------------------
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictItemMapper.java
  View file @75945d8
... ... @@ -15,6 +15,6 @@ import java.util.List;
15 15 * @since 2018-12-28
16 16 */
17 17 public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
18   - @Select("SELECT * FROM SYS_DICT_ITEM WHERE DICT_ID = #{mainId}")
  18 + @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc")
19 19 public List<SysDictItem> selectItemsByMainId(String mainId);
20 20 }
... ...