diff --git a/README.md b/README.md index 956c0705f7d78de301ef59c80756969d80bc4ffe..2fb88b3c0e83ea1b04b27b5df8066d15312b3d87 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ### 项目介绍 -星云ERP基于SpringBoot框架，为中小企业提供完全开源、永久免费、用户体验好的进销存ERP系统，解决开店难、管理难、数据统计难的问题。星云ERP主要包括基础信息管理、商品中心、采购管理、销售管理、零售管理、库存管理、盘点管理、结算管理等，各业务模块均支持参数配置，满足实际遇到的各种业务场景。丰富的报表模块支持用户做各项数据分析。同时支持对部门、岗位、角色、用户、权限等进行精细化管理。最终，达到业务线上化、透明化、简易化管理的目标，实现物流、资金流、信息流的一体化管控。 +星云ERP基于SpringBoot框架，为中小企业提供完全开源、永久免费、用户体验好的进销存ERP系统，解决开店难、管理难、数据统计难的问题。星云ERP主要包括基础信息管理、商品中心、采购管理、销售管理、零售管理、库存管理、盘点管理、结算管理等，各业务模块均支持参数配置，满足实际遇到的各种业务场景。丰富的报表模块支持用户做各项数据分析。同时支持对部门、角色、用户、权限等进行精细化管理。最终，达到业务线上化、透明化、简易化管理的目标，实现物流、资金流、信息流的一体化管控。 #### 单体架构 @@ -50,15 +50,15 @@ application.yml中的tenant.enabled改为true则代表开启多租户模式；fa | 系统功能 | 功能描述 | |------|-----------------------------| -| 系统管理 | 系统设置、菜单、部门、角色、岗位、用户、操作日志 | +| 系统管理 | 系统设置、菜单、部门、角色、用户、操作日志 | | 基础信息 | 仓库、供应商、客户、会员基础信息 | -| 商品中心 | 商品主数据、类目、品牌、销售属性、属性（自定义属性） | +| 商品中心 | 商品主数据、商品分类、品牌、属性（自定义属性） | | 采购管理 | 采购订单、收货单、退货单 | | 销售管理 | 销售订单、出库单、退货单 | | 零售管理 | 零售出库单、退货单 | -| 库存管理 | 商品库存、商品批次库存、批次库存变动记录 | +| 库存管理 | 商品库存 | | 库存盘点 | 盘点参数设置、预先盘点单管理、盘点任务管理、盘点单管理 | -| 库存调整 | 库存成本调整 | +| 库存调整 | 库存调整原因管理、库存调整 | | 结算管理 | 供应商费用单、预付款单、对账单、结算单、收入/支出项目 | | 代码生成 | 生成增删改查代码 | | 多租户 | 支持多租户 | @@ -77,10 +77,11 @@ application.yml中的tenant.enabled改为true则代表开启多租户模式；fa * JDK 1.8 * Mysql 5.7.18 * Redis 4.0.8（版本可以根据自己的redis进行调整，项目本身依赖Redis的功能很简单，就是两部分：缓存、Session，不会出现大的兼容问题） +* RabbitMQ 3.12.4 ### 技术交流 -QQ交流群号： **717574596** +QQ交流群号： **717574596（已满员）** **562654879** ### 注意事项 @@ -102,34 +103,4 @@ BPM工作流目前是整合AgileBPM工作流管理平台，由于AgileBPM的Lice knife4j knife4j是为Java MVC框架集成Swagger生成Api文档的工具 -FormCreate 强大的动态表单生成器 - -### 系统展示 - -* 首页 - ![输入图片说明](screenshots/1.jpg) -* 系统管理 - ![输入图片说明](screenshots/2.jpg) -* 基础信息管理 - ![输入图片说明](screenshots/3.jpg) -* 商品中心 - ![输入图片说明](screenshots/4.jpg) -* 采购管理 - ![输入图片说明](screenshots/5.jpg) -* 销售管理 - ![输入图片说明](screenshots/6.jpg) -* 零售管理 - ![输入图片说明](screenshots/7.jpg) -* 库存管理 - ![输入图片说明](screenshots/8.jpg) -* 库存盘点 - ![输入图片说明](screenshots/9.jpg) -* 库存调整 - ![输入图片说明](screenshots/10.jpg) -* 结算管理 - ![输入图片说明](screenshots/11.jpg) -* 开发管理 - ![输入图片说明](screenshots/12.jpg) - -### 其他说明 -作者是两只热爱工作、热爱开源的程序猿、产品经理，欢迎大家提出批评、建议！ \ No newline at end of file +FormCreate 强大的动态表单生成器 \ No newline at end of file diff --git a/cloud/conf/common.yaml b/cloud/conf/common.yaml index 1a10bf75d7ddd8e2ab26aa728ec13b61503448f6..279e7d0fc4db65dd6e7a0e7d9d1f6ef03eb5ef5a 100644 --- a/cloud/conf/common.yaml +++ b/cloud/conf/common.yaml @@ -30,6 +30,9 @@ spring: #使用redis存储SESSION session: store-type: redis + redis: + lettuce: + reader-idle-time-seconds: 30 knife4j: enable: true @@ -83,8 +86,6 @@ jugg: location: D:\upload\upload-data #默认配置 default-setting: - #默认单号生成类型 FLOW：流水号 SNOW_FLAKE：雪花算法，如果不配置，默认是SNOW_FLAKE - generator-type: SNOW_FLAKE #默认的用户ID，用于写入数据库时的createById和updateById的自动赋值，如果有登录人则取登录人ID，如果没有则取默认用户ID，如果不配置，默认是1 default-user-id: 1 #默认的用户姓名，用于写入数据库时的createBy和updateBy的自动赋值，如果有登录人则取登录人姓名，如果没有则取默认用户姓名，如果不配置，默认是系统管理员 @@ -97,6 +98,8 @@ jugg: #regions: # cacheName: 3600 # cacheName2: 7200 + regions: + product_stock_warning_notify: 86400 #验证码配置 kaptcha: #过期时间（单位：分钟） diff --git a/cloud/conf/mq.yaml b/cloud/conf/mq.yaml index 403de832558bf4dcadebf3b05585da29bb026b59..cc3f7eb3412fff1f978d71933446004434cfc21e 100644 --- a/cloud/conf/mq.yaml +++ b/cloud/conf/mq.yaml @@ -1,11 +1,23 @@ spring: - activemq: - broker-url: tcp://127.0.0.1:61616 - user: user + #RabbitMQ配置 + rabbitmq: + addresses: 127.0.0.1:5672 # RabbitMQ集群地址列表，多个地址用逗号分隔 + virtual-host: / + username: username password: password - pool: - enabled: true - max-connections: 5 - in-memory: false - packages: - trust-all: true \ No newline at end of file + connection-timeout: 60000 # 连接超时时间（毫秒），默认为60000毫秒（60秒） + ssl: + enabled: false # 是否启用SSL，默认为false + algorithm: TLSv1.2 # SSL算法，默认为TLSv1.2 + publisher-confirm-type: SIMPLE # 发布确认机制 + publisher-returns: true # 是否开启发布返回机制，默认为false + listener: + type: direct + simple: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false + direct: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false \ No newline at end of file diff --git a/cloud/xingyun-cloud-api/pom.xml b/cloud/xingyun-cloud-api/pom.xml index 80b9e2432111e663e7f6a4c894b22d70bfa1f55f..fbf0b6ded32cd15bb593056a3950692aa38a5c4b 100644 --- a/cloud/xingyun-cloud-api/pom.xml +++ b/cloud/xingyun-cloud-api/pom.xml @@ -16,7 +16,7 @@ com.lframework - xingyun-common + xingyun-comp com.lframework @@ -40,7 +40,7 @@ com.lframework - xingyun-template + xingyun-sys diff --git a/cloud/xingyun-cloud-api/src/main/resources/bootstrap.yml b/cloud/xingyun-cloud-api/src/main/resources/bootstrap.yml index 5cd7c40e4531ac3f118bb3457c3bc050ff1f016e..2c1c6596809cf39e2ae8bac7b28a70a2f54a6cf5 100644 --- a/cloud/xingyun-cloud-api/src/main/resources/bootstrap.yml +++ b/cloud/xingyun-cloud-api/src/main/resources/bootstrap.yml @@ -25,9 +25,9 @@ spring: extension-configs[3]: data-id: zipkin.yaml refresh: true - #extension-configs[4]: - # data-id: mq.yaml - # refresh: true + extension-configs[4]: + data-id: mq.yaml + refresh: true discovery: server-addr: ${nacos-server-addr} namespace: ${spring.profiles.active} diff --git a/cloud/xingyun-cloud-api/src/main/resources/project.yaml b/cloud/xingyun-cloud-api/src/main/resources/project.yaml index 57616c28b8336dbbd845c035af5324de9ef1c870..25c6863ea03ccb5b90aef5dcc632269242c64395 100644 --- a/cloud/xingyun-cloud-api/src/main/resources/project.yaml +++ b/cloud/xingyun-cloud-api/src/main/resources/project.yaml @@ -5,6 +5,8 @@ logging: file: name: logs/${spring.application.name}.log max-history: 14 + level: + io.lettuce.core.protocol: OFF jugg: web: diff --git a/pom.xml b/pom.xml index 0bab11229c17be7dd4a97f02fd68b4fb8f0fcef8..8b6230de099b0c9ed98408cd33c9aabacc082f78 100644 --- a/pom.xml +++ b/pom.xml @@ -24,10 +24,9 @@ xingyun-sc xingyun-chart xingyun-settle - xingyun-template - xingyun-template-core + xingyun-sys cloud/xingyun-cloud-api - xingyun-common + xingyun-comp cloud/xingyun-cloud-gateway @@ -35,7 +34,7 @@ 8 8 1.0.0-SNAPSHOT - 3.1.3 + 3.1.5 @@ -47,6 +46,13 @@ pom import + + com.lframework + mq-starter + ${jugg.version} + pom + import + com.lframework xingyun-basedata @@ -55,7 +61,7 @@ com.lframework - xingyun-common + xingyun-comp ${xingyun.version} @@ -72,13 +78,7 @@ com.lframework - xingyun-template - ${xingyun.version} - - - - com.lframework - xingyun-template-core + xingyun-sys ${xingyun.version} diff --git a/screenshots/1.jpg b/screenshots/1.jpg deleted file mode 100644 index a31e9a5e5974efa513bbd30d5d8d191ad9f2f891..0000000000000000000000000000000000000000 Binary files a/screenshots/1.jpg and /dev/null differ diff --git a/screenshots/10.jpg b/screenshots/10.jpg deleted file mode 100644 index 196eaf475d5080109524a084fded97322ac8b8e4..0000000000000000000000000000000000000000 Binary files a/screenshots/10.jpg and /dev/null differ diff --git a/screenshots/11.jpg b/screenshots/11.jpg deleted file mode 100644 index bd4b7edd0e0040f87c27cc85c1c0b7138b2e5b7d..0000000000000000000000000000000000000000 Binary files a/screenshots/11.jpg and /dev/null differ diff --git a/screenshots/12.jpg b/screenshots/12.jpg deleted file mode 100644 index b377a9d22b3044358bb8e41c28b37bd0a1cf5083..0000000000000000000000000000000000000000 Binary files a/screenshots/12.jpg and /dev/null differ diff --git a/screenshots/2.jpg b/screenshots/2.jpg deleted file mode 100644 index 828577a781ece69a2fb54886b79af5065fc6ebba..0000000000000000000000000000000000000000 Binary files a/screenshots/2.jpg and /dev/null differ diff --git a/screenshots/3.jpg b/screenshots/3.jpg deleted file mode 100644 index 07d326cb1971bb23ee356e97ac717b521d8a1d2d..0000000000000000000000000000000000000000 Binary files a/screenshots/3.jpg and /dev/null differ diff --git a/screenshots/4.jpg b/screenshots/4.jpg deleted file mode 100644 index dad54e267ca0fd015f773e96b29169443299fea8..0000000000000000000000000000000000000000 Binary files a/screenshots/4.jpg and /dev/null differ diff --git a/screenshots/5.jpg b/screenshots/5.jpg deleted file mode 100644 index b2c18f5acee29fbc6cdae5660a81bfb42c28094b..0000000000000000000000000000000000000000 Binary files a/screenshots/5.jpg and /dev/null differ diff --git a/screenshots/6.jpg b/screenshots/6.jpg deleted file mode 100644 index 0192d351a63d69a25f099e9b4b2195fbe7b14a96..0000000000000000000000000000000000000000 Binary files a/screenshots/6.jpg and /dev/null differ diff --git a/screenshots/7.jpg b/screenshots/7.jpg deleted file mode 100644 index ab1db12cb2bf18c420bd0e782bd661fc3be205f7..0000000000000000000000000000000000000000 Binary files a/screenshots/7.jpg and /dev/null differ diff --git a/screenshots/8.jpg b/screenshots/8.jpg deleted file mode 100644 index f998210b32b85c7934cb10a39afd659ae93bdc9b..0000000000000000000000000000000000000000 Binary files a/screenshots/8.jpg and /dev/null differ diff --git a/screenshots/9.jpg b/screenshots/9.jpg deleted file mode 100644 index c535eff6e0444560b82004505d2679a72fe7a9f0..0000000000000000000000000000000000000000 Binary files a/screenshots/9.jpg and /dev/null differ diff --git a/xingyun-api/pom.xml b/xingyun-api/pom.xml index adbb64f734c5e3dae0dc041324632e2ba8644ca5..efddfe48e135ad7afec1ba900f287fa0c9a6dae9 100644 --- a/xingyun-api/pom.xml +++ b/xingyun-api/pom.xml @@ -15,7 +15,7 @@ com.lframework - xingyun-common + xingyun-comp com.lframework @@ -39,7 +39,12 @@ com.lframework - xingyun-template + xingyun-sys + + + + com.lframework + rabbitmq-starter diff --git a/xingyun-api/src/main/resources/application-dev.yml b/xingyun-api/src/main/resources/application-dev.yml index cc1ebed405945a93092ab1ae13ca0cdc28ca4731..c1767b62fff44f8671a36b3b7bf06ba54999fb82 100644 --- a/xingyun-api/src/main/resources/application-dev.yml +++ b/xingyun-api/src/main/resources/application-dev.yml @@ -4,6 +4,7 @@ logging: file: ${logging.pattern.console} level: com.lframework: DEBUG + io.lettuce.core.protocol: OFF spring: servlet: @@ -58,6 +59,28 @@ spring: max-active: 8 #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms + #RabbitMQ配置 + rabbitmq: + addresses: 127.0.0.1:5672 # RabbitMQ集群地址列表，多个地址用逗号分隔 + virtual-host: / + username: username + password: password + connection-timeout: 60000 # 连接超时时间（毫秒），默认为60000毫秒（60秒） + ssl: + enabled: false # 是否启用SSL，默认为false + algorithm: TLSv1.2 # SSL算法，默认为TLSv1.2 + publisher-confirm-type: SIMPLE # 发布确认机制 + publisher-returns: true # 是否开启发布返回机制，默认为false + listener: + type: direct + simple: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false + direct: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false sa-token: # 配置 Sa-Token 单独使用的 Redis 连接，将业务和鉴权独立 diff --git a/xingyun-api/src/main/resources/application-prod.yml b/xingyun-api/src/main/resources/application-prod.yml index 0cdd5d4e253585215a9044055cee95c4c2419eff..b37fb8922aef37ea5b0b3249ada83676cacd06c3 100644 --- a/xingyun-api/src/main/resources/application-prod.yml +++ b/xingyun-api/src/main/resources/application-prod.yml @@ -5,6 +5,8 @@ logging: file: name: logs/${spring.application.name}.log max-history: 14 + level: + io.lettuce.core.protocol: OFF spring: servlet: @@ -59,6 +61,28 @@ spring: max-active: 8 #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms + #RabbitMQ配置 + rabbitmq: + addresses: 127.0.0.1:5672 # RabbitMQ集群地址列表，多个地址用逗号分隔 + virtual-host: / + username: username + password: password + connection-timeout: 60000 # 连接超时时间（毫秒），默认为60000毫秒（60秒） + ssl: + enabled: false # 是否启用SSL，默认为false + algorithm: TLSv1.2 # SSL算法，默认为TLSv1.2 + publisher-confirm-type: SIMPLE # 发布确认机制 + publisher-returns: true # 是否开启发布返回机制，默认为false + listener: + type: direct + simple: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false + direct: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false sa-token: # 配置 Sa-Token 单独使用的 Redis 连接，将业务和鉴权独立 diff --git a/xingyun-api/src/main/resources/application-test.yml b/xingyun-api/src/main/resources/application-test.yml index 8733a147297d3a121d6a2871b4ba7c3fd30f0402..e63ba532ae55854826ea7ba4fe519ae07da5ed12 100644 --- a/xingyun-api/src/main/resources/application-test.yml +++ b/xingyun-api/src/main/resources/application-test.yml @@ -5,6 +5,8 @@ logging: file: name: logs/${spring.application.name}.log max-history: 14 + level: + io.lettuce.core.protocol: OFF spring: servlet: @@ -59,6 +61,28 @@ spring: max-active: 8 #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms + #RabbitMQ配置 + rabbitmq: + addresses: 127.0.0.1:5672 # RabbitMQ集群地址列表，多个地址用逗号分隔 + virtual-host: / + username: username + password: password + connection-timeout: 60000 # 连接超时时间（毫秒），默认为60000毫秒（60秒） + ssl: + enabled: false # 是否启用SSL，默认为false + algorithm: TLSv1.2 # SSL算法，默认为TLSv1.2 + publisher-confirm-type: SIMPLE # 发布确认机制 + publisher-returns: true # 是否开启发布返回机制，默认为false + listener: + type: direct + simple: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false + direct: + acknowledge-mode: AUTO # 消费者确认模式，默认为auto + retry: + enabled: false # 是否启用重试机制，默认为false sa-token: # 配置 Sa-Token 单独使用的 Redis 连接，将业务和鉴权独立 diff --git a/xingyun-api/src/main/resources/application.yml b/xingyun-api/src/main/resources/application.yml index 587bc05ca46f399777072ffb0e9ca3d57a52f7ca..9c83f39434d8f112527adeb460fcb91c9ff5005e 100644 --- a/xingyun-api/src/main/resources/application.yml +++ b/xingyun-api/src/main/resources/application.yml @@ -30,6 +30,9 @@ spring: #使用redis存储SESSION session: store-type: redis + redis: + lettuce: + reader-idle-time-seconds: 30 knife4j: enable: true @@ -76,8 +79,6 @@ jugg: key: eRE2drUFINojkG9ivqtfOA== #默认配置 default-setting: - #默认单号生成类型 FLOW：流水号 SNOW_FLAKE：雪花算法，如果不配置，默认是SNOW_FLAKE - generator-type: SNOW_FLAKE #默认的用户ID，用于写入数据库时的createById和updateById的自动赋值，如果有登录人则取登录人ID，如果没有则取默认用户ID，如果不配置，默认是1 default-user-id: 1 #默认的用户姓名，用于写入数据库时的createBy和updateBy的自动赋值，如果有登录人则取登录人姓名，如果没有则取默认用户姓名，如果不配置，默认是系统管理员 @@ -101,6 +102,8 @@ jugg: #regions: # cacheName: 3600 # cacheName2: 7200 + regions: + product_stock_warning_notify: 86400 #开启多租户 tenant: enabled: true diff --git a/xingyun-api/src/main/resources/db/all/platform.sql b/xingyun-api/src/main/resources/db/all/platform.sql index 6d28672e8fa47433970f6afb31182338d2767cba..d28f69348193cf2edea7f41a0e868d06daff4f95 100644 --- a/xingyun-api/src/main/resources/db/all/platform.sql +++ b/xingyun-api/src/main/resources/db/all/platform.sql @@ -5,384 +5,418 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for magic_api_file -- ---------------------------- DROP TABLE IF EXISTS `magic_api_file`; -CREATE TABLE `magic_api_file` ( - `file_path` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `file_content` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, +CREATE TABLE `magic_api_file` ( + `file_path` varchar(512) NOT NULL, + `file_content` mediumtext, PRIMARY KEY (`file_path`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of magic_api_file -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for magic_api_file_backup -- ---------------------------- DROP TABLE IF EXISTS `magic_api_file_backup`; -CREATE TABLE `magic_api_file_backup` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原对象ID', +CREATE TABLE `magic_api_file_backup` ( + `id` varchar(32) NOT NULL COMMENT '原对象ID', `create_date` bigint(13) NOT NULL COMMENT '备份时间', - `tag` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签', - `type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型', - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原名称', - `content` blob NULL COMMENT '备份内容', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作人', - PRIMARY KEY (`id`, `create_date`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + `tag` varchar(32) DEFAULT NULL COMMENT '标签', + `type` varchar(32) DEFAULT NULL COMMENT '类型', + `name` varchar(64) DEFAULT NULL COMMENT '原名称', + `content` blob COMMENT '备份内容', + `create_by` varchar(64) DEFAULT NULL COMMENT '操作人', + PRIMARY KEY (`id`,`create_date`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of magic_api_file_backup -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_blob_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_blob_triggers`; -CREATE TABLE `qrtz_blob_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `BLOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `SCHED_NAME`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - 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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_blob_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + `BLOB_DATA` blob, + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + KEY `SCHED_NAME` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_blob_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_calendars -- ---------------------------- DROP TABLE IF EXISTS `qrtz_calendars`; -CREATE TABLE `qrtz_calendars` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `CALENDAR_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `qrtz_calendars` ( + `SCHED_NAME` varchar(120) NOT NULL, + `CALENDAR_NAME` varchar(190) NOT NULL, `CALENDAR` blob NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + PRIMARY KEY (`SCHED_NAME`,`CALENDAR_NAME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_calendars -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_cron_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_cron_triggers`; -CREATE TABLE `qrtz_cron_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `CRON_EXPRESSION` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TIME_ZONE_ID` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - 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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_cron_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + `CRON_EXPRESSION` varchar(120) NOT NULL, + `TIME_ZONE_ID` varchar(80) DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_cron_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_fired_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_fired_triggers`; -CREATE TABLE `qrtz_fired_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `ENTRY_ID` varchar(95) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `INSTANCE_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `qrtz_fired_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `ENTRY_ID` varchar(95) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + `INSTANCE_NAME` varchar(190) NOT NULL, `FIRED_TIME` bigint(13) NOT NULL, `SCHED_TIME` bigint(13) NOT NULL, `PRIORITY` int(11) NOT NULL, - `STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`) USING BTREE, - INDEX `IDX_QRTZ_FT_TRIG_INST_NAME`(`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE, - INDEX `IDX_QRTZ_FT_INST_JOB_REQ_RCVRY`(`SCHED_NAME`, `INSTANCE_NAME`, `REQUESTS_RECOVERY`) USING BTREE, - INDEX `IDX_QRTZ_FT_J_G`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_JG`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_T_G`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_FT_TG`(`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + `STATE` varchar(16) NOT NULL, + `JOB_NAME` varchar(190) DEFAULT NULL, + `JOB_GROUP` varchar(190) DEFAULT NULL, + `IS_NONCONCURRENT` varchar(1) DEFAULT NULL, + `REQUESTS_RECOVERY` varchar(1) DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`,`ENTRY_ID`) USING BTREE, + KEY `IDX_QRTZ_FT_TRIG_INST_NAME` (`SCHED_NAME`,`INSTANCE_NAME`) USING BTREE, + KEY `IDX_QRTZ_FT_INST_JOB_REQ_RCVRY` (`SCHED_NAME`,`INSTANCE_NAME`,`REQUESTS_RECOVERY`) USING BTREE, + KEY `IDX_QRTZ_FT_J_G` (`SCHED_NAME`,`JOB_NAME`,`JOB_GROUP`) USING BTREE, + KEY `IDX_QRTZ_FT_JG` (`SCHED_NAME`,`JOB_GROUP`) USING BTREE, + KEY `IDX_QRTZ_FT_T_G` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + KEY `IDX_QRTZ_FT_TG` (`SCHED_NAME`,`TRIGGER_GROUP`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_fired_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_job_details -- ---------------------------- DROP TABLE IF EXISTS `qrtz_job_details`; -CREATE TABLE `qrtz_job_details` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `JOB_CLASS_NAME` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_DURABLE` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `IS_UPDATE_DATA` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_J_REQ_RECOVERY`(`SCHED_NAME`, `REQUESTS_RECOVERY`) USING BTREE, - INDEX `IDX_QRTZ_J_GRP`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_job_details` ( + `SCHED_NAME` varchar(120) NOT NULL, + `JOB_NAME` varchar(190) NOT NULL, + `JOB_GROUP` varchar(190) NOT NULL, + `DESCRIPTION` varchar(250) DEFAULT NULL, + `JOB_CLASS_NAME` varchar(250) NOT NULL, + `IS_DURABLE` varchar(1) NOT NULL, + `IS_NONCONCURRENT` varchar(1) NOT NULL, + `IS_UPDATE_DATA` varchar(1) NOT NULL, + `REQUESTS_RECOVERY` varchar(1) NOT NULL, + `JOB_DATA` blob, + PRIMARY KEY (`SCHED_NAME`,`JOB_NAME`,`JOB_GROUP`) USING BTREE, + KEY `IDX_QRTZ_J_REQ_RECOVERY` (`SCHED_NAME`,`REQUESTS_RECOVERY`) USING BTREE, + KEY `IDX_QRTZ_J_GRP` (`SCHED_NAME`,`JOB_GROUP`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_job_details -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_locks -- ---------------------------- DROP TABLE IF EXISTS `qrtz_locks`; -CREATE TABLE `qrtz_locks` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `LOCK_NAME` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_locks` ( + `SCHED_NAME` varchar(120) NOT NULL, + `LOCK_NAME` varchar(40) NOT NULL, + PRIMARY KEY (`SCHED_NAME`,`LOCK_NAME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_locks -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_paused_trigger_grps -- ---------------------------- DROP TABLE IF EXISTS `qrtz_paused_trigger_grps`; -CREATE TABLE `qrtz_paused_trigger_grps` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_paused_trigger_grps` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_GROUP`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_paused_trigger_grps -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_scheduler_state -- ---------------------------- DROP TABLE IF EXISTS `qrtz_scheduler_state`; -CREATE TABLE `qrtz_scheduler_state` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `INSTANCE_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `qrtz_scheduler_state` ( + `SCHED_NAME` varchar(120) NOT NULL, + `INSTANCE_NAME` varchar(190) NOT NULL, `LAST_CHECKIN_TIME` bigint(13) NOT NULL, `CHECKIN_INTERVAL` bigint(13) NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + PRIMARY KEY (`SCHED_NAME`,`INSTANCE_NAME`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_scheduler_state -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_simple_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_simple_triggers`; -CREATE TABLE `qrtz_simple_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `qrtz_simple_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, `REPEAT_COUNT` bigint(7) NOT NULL, `REPEAT_INTERVAL` bigint(12) NOT NULL, `TIMES_TRIGGERED` bigint(10) NOT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - 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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + CONSTRAINT `qrtz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_simple_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_simprop_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_simprop_triggers`; -CREATE TABLE `qrtz_simprop_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `STR_PROP_1` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `STR_PROP_2` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `STR_PROP_3` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `INT_PROP_1` int(11) NULL DEFAULT NULL, - `INT_PROP_2` int(11) NULL DEFAULT NULL, - `LONG_PROP_1` bigint(20) NULL DEFAULT NULL, - `LONG_PROP_2` bigint(20) NULL DEFAULT NULL, - `DEC_PROP_1` decimal(13, 4) NULL DEFAULT NULL, - `DEC_PROP_2` decimal(13, 4) NULL DEFAULT NULL, - `BOOL_PROP_1` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `BOOL_PROP_2` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - 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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +CREATE TABLE `qrtz_simprop_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + `STR_PROP_1` varchar(512) DEFAULT NULL, + `STR_PROP_2` varchar(512) DEFAULT NULL, + `STR_PROP_3` varchar(512) DEFAULT NULL, + `INT_PROP_1` int(11) DEFAULT NULL, + `INT_PROP_2` int(11) DEFAULT NULL, + `LONG_PROP_1` bigint(20) DEFAULT NULL, + `LONG_PROP_2` bigint(20) DEFAULT NULL, + `DEC_PROP_1` decimal(13,4) DEFAULT NULL, + `DEC_PROP_2` decimal(13,4) DEFAULT NULL, + `BOOL_PROP_1` varchar(1) DEFAULT NULL, + `BOOL_PROP_2` varchar(1) DEFAULT NULL, + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + CONSTRAINT `qrtz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `qrtz_triggers` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_simprop_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for qrtz_triggers -- ---------------------------- DROP TABLE IF EXISTS `qrtz_triggers`; -CREATE TABLE `qrtz_triggers` ( - `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `JOB_GROUP` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `NEXT_FIRE_TIME` bigint(13) NULL DEFAULT NULL, - `PREV_FIRE_TIME` bigint(13) NULL DEFAULT NULL, - `PRIORITY` int(11) NULL DEFAULT NULL, - `TRIGGER_STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `TRIGGER_TYPE` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `qrtz_triggers` ( + `SCHED_NAME` varchar(120) NOT NULL, + `TRIGGER_NAME` varchar(190) NOT NULL, + `TRIGGER_GROUP` varchar(190) NOT NULL, + `JOB_NAME` varchar(190) NOT NULL, + `JOB_GROUP` varchar(190) NOT NULL, + `DESCRIPTION` varchar(250) DEFAULT NULL, + `NEXT_FIRE_TIME` bigint(13) DEFAULT NULL, + `PREV_FIRE_TIME` bigint(13) DEFAULT NULL, + `PRIORITY` int(11) DEFAULT NULL, + `TRIGGER_STATE` varchar(16) NOT NULL, + `TRIGGER_TYPE` varchar(8) NOT NULL, `START_TIME` bigint(13) NOT NULL, - `END_TIME` bigint(13) NULL DEFAULT NULL, - `CALENDAR_NAME` varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `MISFIRE_INSTR` smallint(2) NULL DEFAULT NULL, - `JOB_DATA` blob NULL, - PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_J`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_JG`(`SCHED_NAME`, `JOB_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_C`(`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE, - INDEX `IDX_QRTZ_T_G`(`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE, - INDEX `IDX_QRTZ_T_STATE`(`SCHED_NAME`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_N_STATE`(`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_N_G_STATE`(`SCHED_NAME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_NEXT_FIRE_TIME`(`SCHED_NAME`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST`(`SCHED_NAME`, `TRIGGER_STATE`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_MISFIRE`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST_MISFIRE`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`, `TRIGGER_STATE`) USING BTREE, - INDEX `IDX_QRTZ_T_NFT_ST_MISFIRE_GRP`(`SCHED_NAME`, `MISFIRE_INSTR`, `NEXT_FIRE_TIME`, `TRIGGER_GROUP`, `TRIGGER_STATE`) USING BTREE, - 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 -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + `END_TIME` bigint(13) DEFAULT NULL, + `CALENDAR_NAME` varchar(190) DEFAULT NULL, + `MISFIRE_INSTR` smallint(2) DEFAULT NULL, + `JOB_DATA` blob, + PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`) USING BTREE, + KEY `IDX_QRTZ_T_J` (`SCHED_NAME`,`JOB_NAME`,`JOB_GROUP`) USING BTREE, + KEY `IDX_QRTZ_T_JG` (`SCHED_NAME`,`JOB_GROUP`) USING BTREE, + KEY `IDX_QRTZ_T_C` (`SCHED_NAME`,`CALENDAR_NAME`) USING BTREE, + KEY `IDX_QRTZ_T_G` (`SCHED_NAME`,`TRIGGER_GROUP`) USING BTREE, + KEY `IDX_QRTZ_T_STATE` (`SCHED_NAME`,`TRIGGER_STATE`) USING BTREE, + KEY `IDX_QRTZ_T_N_STATE` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`,`TRIGGER_STATE`) USING BTREE, + KEY `IDX_QRTZ_T_N_G_STATE` (`SCHED_NAME`,`TRIGGER_GROUP`,`TRIGGER_STATE`) USING BTREE, + KEY `IDX_QRTZ_T_NEXT_FIRE_TIME` (`SCHED_NAME`,`NEXT_FIRE_TIME`) USING BTREE, + KEY `IDX_QRTZ_T_NFT_ST` (`SCHED_NAME`,`TRIGGER_STATE`,`NEXT_FIRE_TIME`) USING BTREE, + KEY `IDX_QRTZ_T_NFT_MISFIRE` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`) USING BTREE, + KEY `IDX_QRTZ_T_NFT_ST_MISFIRE` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_STATE`) USING BTREE, + KEY `IDX_QRTZ_T_NFT_ST_MISFIRE_GRP` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_GROUP`,`TRIGGER_STATE`) USING BTREE, + CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `qrtz_job_details` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of qrtz_triggers -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_module -- ---------------------------- DROP TABLE IF EXISTS `sys_module`; -CREATE TABLE `sys_module` ( +CREATE TABLE `sys_module` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统模块' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统模块'; -- ---------------------------- -- Records of sys_module -- ---------------------------- -INSERT INTO `sys_module` VALUES (1, '平台管理', '系统平台的核心模块。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (2, '系统管理', '维护企业、系统基础数据，包括部门、岗位、角色、系统菜单和参数等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (3, '基础信息管理', '维护基础业务数据，包括仓库、客户、供应商、会员等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (4, '商品中心', '管理商品核心数据。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (5, '采购业务', '管理供应商与企业的采购业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (6, '销售业务', '管理企业与TOB端大客户的销售业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (7, '零售业务', '管理企业与TOC端会员的零售业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (8, '库存管理及调拨', '查询商品库存和进行商品调拨。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (9, '库存盘点', '库存商品盘点。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (10, '库存调整', '商品库存数量和成本调整。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (11, '结算管理', '企业与供应商、客户进行结算。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (12, '开发管理', '系统快捷开发，如管理定时器、数据实体、数据对象、表单生成等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (13, '便捷办公', '支持文件收纳和在线Excel。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (14, '开放平台', '系统开放平台管理。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); -INSERT INTO `sys_module` VALUES (15, '物流发货', '管理企业物流业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +BEGIN; +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (1, '平台管理', '系统平台的核心模块。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (2, '系统管理', '维护企业、系统基础数据，包括部门、岗位、角色、系统菜单和参数等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (3, '基础信息管理', '维护基础业务数据，包括仓库、客户、供应商、会员等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (4, '商品中心', '管理商品核心数据。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (5, '采购业务', '管理供应商与企业的采购业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (6, '销售业务', '管理企业与TOB端大客户的销售业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (7, '零售业务', '管理企业与TOC端会员的零售业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (8, '库存管理及调拨', '查询商品库存和进行商品调拨。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (9, '库存盘点', '库存商品盘点。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (10, '库存调整', '商品库存调整。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (11, '结算管理', '企业与供应商、客户进行结算。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (12, '开发管理', '系统快捷开发，如管理定时器、数据实体、数据对象、表单生成等。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (13, '便捷办公', '支持文件收纳和在线Excel。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (14, '开放平台', '系统开放平台管理。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +INSERT INTO `sys_module` (`id`, `name`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (15, '物流发货', '管理企业物流业务。', '系统管理员', '1', '2023-06-06 10:26:30', '系统管理员', '1', '2023-06-06 10:26:41'); +COMMIT; -- ---------------------------- -- Table structure for sys_module_tenant -- ---------------------------- DROP TABLE IF EXISTS `sys_module_tenant`; -CREATE TABLE `sys_module_tenant` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', +CREATE TABLE `sys_module_tenant` ( + `id` varchar(32) NOT NULL COMMENT 'ID', `module_id` int(11) NOT NULL COMMENT '模块ID', `tenant_id` int(11) NOT NULL COMMENT '租户ID', `expire_time` datetime NOT NULL COMMENT '过期时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `name`(`tenant_id`, `module_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租户和系统模块关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `name` (`tenant_id`,`module_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='租户和系统模块关系表'; -- ---------------------------- -- Records of sys_module_tenant -- ---------------------------- -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875135', 1, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875136', 2, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875137', 3, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875138', 4, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875139', 5, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875140', 6, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875141', 7, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875142', 8, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875143', 9, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875144', 10, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875145', 11, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875146', 12, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875147', 13, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875148', 14, 1000, '2099-01-01 00:00:00'); -INSERT INTO `sys_module_tenant` VALUES ('1666286094246875149', 15, 1000, '2099-01-01 00:00:00'); +BEGIN; +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875135', 1, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875136', 2, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875137', 3, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875138', 4, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875139', 5, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875140', 6, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875141', 7, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875142', 8, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875143', 9, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875144', 10, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875145', 11, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875146', 12, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875147', 13, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875148', 14, 1000, '2099-01-01 00:00:00'); +INSERT INTO `sys_module_tenant` (`id`, `module_id`, `tenant_id`, `expire_time`) VALUES ('1666286094246875149', 15, 1000, '2099-01-01 00:00:00'); +COMMIT; -- ---------------------------- -- Table structure for sys_open_domain -- ---------------------------- DROP TABLE IF EXISTS `sys_open_domain`; -CREATE TABLE `sys_open_domain` ( +CREATE TABLE `sys_open_domain` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `api_secret` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'API秘钥', + `name` varchar(20) NOT NULL COMMENT '名称', + `api_secret` varchar(100) NOT NULL COMMENT 'API秘钥', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `tenant_id` int(11) NULL DEFAULT NULL COMMENT '租户ID', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `tenant_id` int(11) DEFAULT NULL COMMENT '租户ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '开放域' ROW_FORMAT = Dynamic; + UNIQUE KEY `name` (`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='开放域'; -- ---------------------------- -- Records of sys_open_domain -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tenant -- ---------------------------- DROP TABLE IF EXISTS `tenant`; -CREATE TABLE `tenant` ( +CREATE TABLE `tenant` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `jdbc_url` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'JDBC连接地址', - `jdbc_username` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'JDBC用户名', - `jdbc_password` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'JDBC密码', + `name` varchar(200) NOT NULL COMMENT '名称', + `jdbc_url` varchar(400) NOT NULL COMMENT 'JDBC连接地址', + `jdbc_username` varchar(200) NOT NULL COMMENT 'JDBC用户名', + `jdbc_password` varchar(200) NOT NULL COMMENT 'JDBC密码', `available` tinyint(1) NOT NULL COMMENT '状态', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1001 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租户' ROW_FORMAT = Dynamic; +) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='租户'; -- ---------------------------- -- Records of tenant -- ---------------------------- -INSERT INTO `tenant` VALUES (1000, '测试租户', 'jdbc:mysql://127.0.0.1:3306/xingyun', 'root', '24590d72bfb4d71ccbc533570aa9627b', 1, '2022-12-31 22:59:21', '2023-03-13 22:14:07'); +BEGIN; +INSERT INTO `tenant` (`id`, `name`, `jdbc_url`, `jdbc_username`, `jdbc_password`, `available`, `create_time`, `update_time`) VALUES (1000, '测试租户', 'jdbc:mysql://127.0.0.1:3306/xingyun', 'root', '24590d72bfb4d71ccbc533570aa9627b', 1, '2022-12-31 22:59:21', '2023-03-13 22:14:07'); +COMMIT; -SET FOREIGN_KEY_CHECKS = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/all/tenant.sql b/xingyun-api/src/main/resources/db/all/tenant.sql index a559de5a2e7a710e1e8e068a308b444124cc28ed..cd22920bf142ee87ba1ecb45eebeabe580e077e0 100644 --- a/xingyun-api/src/main/resources/db/all/tenant.sql +++ b/xingyun-api/src/main/resources/db/all/tenant.sql @@ -1,4 +1,3 @@ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -6,7136 +5,7513 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for base_data_address -- ---------------------------- DROP TABLE IF EXISTS `base_data_address`; -CREATE TABLE `base_data_address` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `entity_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '实体ID', +CREATE TABLE `base_data_address` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `entity_id` varchar(32) NOT NULL COMMENT '实体ID', `entity_type` tinyint(3) NOT NULL COMMENT '实体类型', `address_type` tinyint(3) NOT NULL COMMENT '地址类型', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '姓名', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '手机号', - `province_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '省', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '市', - `district_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区', - `address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '详细地址', - `is_default` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否默认地址', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `name` varchar(100) NOT NULL COMMENT '姓名', + `telephone` varchar(20) NOT NULL COMMENT '手机号', + `province_id` varchar(32) NOT NULL COMMENT '省', + `city_id` varchar(32) NOT NULL COMMENT '市', + `district_id` varchar(32) NOT NULL COMMENT '区', + `address` varchar(200) NOT NULL COMMENT '详细地址', + `is_default` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否默认地址', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `entity_id`(`entity_id`, `entity_type`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '地址库' ROW_FORMAT = DYNAMIC; + KEY `entity_id` (`entity_id`,`entity_type`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='地址库'; -- ---------------------------- -- Records of base_data_address -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_customer -- ---------------------------- DROP TABLE IF EXISTS `base_data_customer`; -CREATE TABLE `base_data_customer` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `mnemonic_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '助记码', - `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', - `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮箱', - `zip_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮编', - `fax` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '传真', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区ID', - `address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `settle_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算方式', - `credit_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码', - `tax_identify_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '纳税人识别号', - `bank_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户银行', - `account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户名', - `account_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账号', +CREATE TABLE `base_data_customer` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `mnemonic_code` varchar(20) NOT NULL COMMENT '简码', + `contact` varchar(100) DEFAULT NULL COMMENT '联系人', + `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', + `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', + `zip_code` varchar(20) DEFAULT NULL COMMENT '邮编', + `fax` varchar(100) DEFAULT NULL COMMENT '传真', + `city_id` varchar(32) DEFAULT NULL COMMENT '地区ID', + `address` varchar(200) DEFAULT NULL COMMENT '地址', + `settle_type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '结算方式', + `credit_code` varchar(100) DEFAULT NULL COMMENT '统一社会信用代码', + `tax_identify_no` varchar(100) DEFAULT NULL COMMENT '纳税人识别号', + `bank_name` varchar(100) DEFAULT NULL COMMENT '开户银行', + `account_name` varchar(100) DEFAULT NULL COMMENT '户名', + `account_no` varchar(100) DEFAULT NULL COMMENT '银行账号', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户'; -- ---------------------------- -- Records of base_data_customer -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_logistics_company -- ---------------------------- DROP TABLE IF EXISTS `base_data_logistics_company`; -CREATE TABLE `base_data_logistics_company` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区ID', - `address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `base_data_logistics_company` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `contact` varchar(100) DEFAULT NULL COMMENT '联系人', + `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', + `city_id` varchar(32) DEFAULT NULL COMMENT '地区ID', + `address` varchar(200) DEFAULT NULL COMMENT '地址', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物流公司' ROW_FORMAT = Dynamic; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='物流公司'; -- ---------------------------- -- Records of base_data_logistics_company -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_member -- ---------------------------- DROP TABLE IF EXISTS `base_data_member`; -CREATE TABLE `base_data_member` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `gender` tinyint(3) NOT NULL DEFAULT 0 COMMENT '性别', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', - `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮箱', - `birthday` date NULL DEFAULT NULL COMMENT '出生日期', +CREATE TABLE `base_data_member` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `gender` tinyint(3) NOT NULL DEFAULT '0' COMMENT '性别', + `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', + `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', + `birthday` date DEFAULT NULL COMMENT '出生日期', `join_day` date NOT NULL COMMENT '入会日期', - `shop_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属门店', - `guider_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属导购', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区ID', + `shop_id` varchar(32) DEFAULT NULL COMMENT '所属门店', + `guider_id` varchar(32) DEFAULT NULL COMMENT '所属导购', + `city_id` varchar(32) DEFAULT NULL COMMENT '地区ID', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `telephone`(`telephone`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会员' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `telephone` (`telephone`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='会员'; -- ---------------------------- -- Records of base_data_member -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_pay_type -- ---------------------------- DROP TABLE IF EXISTS `base_data_pay_type`; -CREATE TABLE `base_data_pay_type` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', +CREATE TABLE `base_data_pay_type` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', `rec_text` tinyint(1) NOT NULL COMMENT '是否记录内容', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付方式' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; -- ---------------------------- -- Records of base_data_pay_type -- ---------------------------- -INSERT INTO `base_data_pay_type` VALUES ('1', '001', '现金', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); -INSERT INTO `base_data_pay_type` VALUES ('2', '002', '微信支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); -INSERT INTO `base_data_pay_type` VALUES ('3', '003', '支付宝支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); -INSERT INTO `base_data_pay_type` VALUES ('4', '004', '移动支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); -INSERT INTO `base_data_pay_type` VALUES ('5', '005', '优惠券', 1, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); -INSERT INTO `base_data_pay_type` VALUES ('6', '006', '积分', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +BEGIN; +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '现金', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2', '002', '微信支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3', '003', '支付宝支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4', '004', '移动支付', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5', '005', '优惠券', 1, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +INSERT INTO `base_data_pay_type` (`id`, `code`, `name`, `rec_text`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('6', '006', '积分', 0, 1, '', '系统管理员', '1', '2023-03-21 10:09:44', '系统管理员', '1', '2023-03-21 10:12:30'); +COMMIT; -- ---------------------------- -- Table structure for base_data_product -- ---------------------------- DROP TABLE IF EXISTS `base_data_product`; -CREATE TABLE `base_data_product` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `short_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '简称', - `sku_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'SKU', - `external_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部编号', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类目ID', - `brand_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '品牌ID', - `product_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '商品类型', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '进项税率（%）', - `sale_tax_rate` decimal(16, 2) NOT NULL COMMENT '销项税率', - `spec` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '规格', - `unit` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位', - `weight` decimal(16, 2) NULL DEFAULT NULL COMMENT '重量（kg）', - `volume` decimal(16, 2) NULL DEFAULT NULL COMMENT '体积（cm3）', +CREATE TABLE `base_data_product` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(100) NOT NULL COMMENT '名称', + `short_name` varchar(100) DEFAULT NULL COMMENT '简称', + `sku_code` varchar(100) NOT NULL COMMENT 'SKU', + `external_code` varchar(100) DEFAULT NULL COMMENT '简码', + `category_id` varchar(32) NOT NULL COMMENT '类目ID', + `brand_id` varchar(32) NOT NULL COMMENT '品牌ID', + `product_type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '商品类型', + `tax_rate` decimal(16,2) NOT NULL COMMENT '进项税率（%）', + `sale_tax_rate` decimal(16,2) NOT NULL COMMENT '销项税率', + `spec` varchar(20) DEFAULT NULL COMMENT '规格', + `unit` varchar(20) DEFAULT NULL COMMENT '单位', + `weight` decimal(16,2) DEFAULT NULL COMMENT '重量（kg）', + `volume` decimal(16,2) DEFAULT NULL COMMENT '体积（cm3）', `available` tinyint(1) NOT NULL COMMENT '状态', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `sku_code`(`sku_code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `sku_code` (`sku_code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品'; -- ---------------------------- -- Records of base_data_product -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_brand -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_brand`; -CREATE TABLE `base_data_product_brand` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `short_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '简称', - `logo` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'logo', - `introduction` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '简介', +CREATE TABLE `base_data_product_brand` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `short_name` varchar(20) DEFAULT '' COMMENT '简称', + `logo` longtext COMMENT 'logo', + `introduction` varchar(400) NOT NULL DEFAULT '' COMMENT '简介', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品品牌' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品品牌'; -- ---------------------------- -- Records of base_data_product_brand -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_bundle -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_bundle`; -CREATE TABLE `base_data_product_bundle` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `main_product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主商品ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品ID', +CREATE TABLE `base_data_product_bundle` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `main_product_id` varchar(32) NOT NULL COMMENT '主商品ID', + `product_id` varchar(32) NOT NULL COMMENT '单品ID', `bundle_num` int(11) NOT NULL COMMENT '包含数量', - `sale_price` decimal(24, 2) NOT NULL COMMENT '销售价', - `retail_price` decimal(24, 2) NOT NULL COMMENT '零售价', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `sale_price` decimal(24,2) NOT NULL COMMENT '销售价', + `retail_price` decimal(24,2) NOT NULL COMMENT '零售价', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `main_product_id`(`main_product_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组合商品' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `main_product_id` (`main_product_id`,`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组合商品'; -- ---------------------------- -- Records of base_data_product_bundle -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_category -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_category`; -CREATE TABLE `base_data_product_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID', +CREATE TABLE `base_data_product_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(100) NOT NULL COMMENT '名称', + `parent_id` varchar(32) DEFAULT NULL COMMENT '父级ID', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品类目' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品类目'; -- ---------------------------- -- Records of base_data_product_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_category_property -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_category_property`; -CREATE TABLE `base_data_product_category_property` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `property_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品属性ID', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品类目ID', +CREATE TABLE `base_data_product_category_property` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `property_id` varchar(32) NOT NULL COMMENT '商品属性ID', + `category_id` varchar(32) NOT NULL COMMENT '商品类目ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `property_id`(`property_id`, `category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品类目和商品属性关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `property_id` (`property_id`,`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品类目和商品属性关系表'; -- ---------------------------- -- Records of base_data_product_category_property -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_property -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_property`; -CREATE TABLE `base_data_product_property` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', +CREATE TABLE `base_data_product_property` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', `is_required` tinyint(1) NOT NULL COMMENT '是否必填', `column_type` tinyint(3) NOT NULL COMMENT '录入类型', - `column_data_type` tinyint(3) NULL DEFAULT NULL COMMENT '数据类型', + `column_data_type` tinyint(3) DEFAULT NULL COMMENT '数据类型', `property_type` tinyint(3) NOT NULL COMMENT '属性类别', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品属性' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品属性'; -- ---------------------------- -- Records of base_data_product_property -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_property_item -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_property_item`; -CREATE TABLE `base_data_product_property_item` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `property_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性ID', +CREATE TABLE `base_data_product_property_item` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `property_id` varchar(32) NOT NULL COMMENT '属性ID', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `property_id`(`property_id`, `code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品属性值' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `property_id` (`property_id`,`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品属性值'; -- ---------------------------- -- Records of base_data_product_property_item -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_property_relation -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_property_relation`; -CREATE TABLE `base_data_product_property_relation` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', - `property_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品属性ID', - `property_item_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性值ID', - `property_text` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品属性值', +CREATE TABLE `base_data_product_property_relation` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', + `property_id` varchar(32) NOT NULL COMMENT '商品属性ID', + `property_item_id` varchar(32) DEFAULT NULL COMMENT '属性值ID', + `property_text` varchar(100) DEFAULT NULL COMMENT '商品属性值', PRIMARY KEY (`id`) USING BTREE, - INDEX `product_id`(`product_id`, `property_id`, `property_item_id`) USING BTREE, - INDEX `property_id`(`property_id`, `property_item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品和商品属性关系表' ROW_FORMAT = DYNAMIC; + KEY `product_id` (`product_id`,`property_id`,`property_item_id`) USING BTREE, + KEY `property_id` (`property_id`,`property_item_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品和商品属性关系表'; -- ---------------------------- -- Records of base_data_product_property_relation -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_purchase -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_purchase`; -CREATE TABLE `base_data_product_purchase` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `price` decimal(24, 2) NOT NULL COMMENT '采购价', +CREATE TABLE `base_data_product_purchase` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `price` decimal(24,2) NOT NULL COMMENT '采购价', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品采购价' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品采购价'; -- ---------------------------- -- Records of base_data_product_purchase -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_retail -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_retail`; -CREATE TABLE `base_data_product_retail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `price` decimal(24, 2) NOT NULL COMMENT '零售价', +CREATE TABLE `base_data_product_retail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `price` decimal(24,2) NOT NULL COMMENT '零售价', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品零售价' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品零售价'; -- ---------------------------- -- Records of base_data_product_retail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_product_sale -- ---------------------------- DROP TABLE IF EXISTS `base_data_product_sale`; -CREATE TABLE `base_data_product_sale` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `price` decimal(24, 2) NOT NULL COMMENT '销售价', +CREATE TABLE `base_data_product_sale` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `price` decimal(24,2) NOT NULL COMMENT '销售价', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品销售价' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品销售价'; -- ---------------------------- -- Records of base_data_product_sale -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_store_center -- ---------------------------- DROP TABLE IF EXISTS `base_data_store_center`; -CREATE TABLE `base_data_store_center` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人手机号码', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区ID', - `address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `people_num` int(11) NULL DEFAULT NULL COMMENT '仓库人数', +CREATE TABLE `base_data_store_center` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `contact` varchar(100) DEFAULT NULL COMMENT '联系人', + `telephone` varchar(20) DEFAULT NULL COMMENT '联系人手机号码', + `city_id` varchar(32) DEFAULT NULL COMMENT '地区ID', + `address` varchar(200) DEFAULT NULL COMMENT '地址', + `people_num` int(11) DEFAULT NULL COMMENT '仓库人数', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='仓库'; -- ---------------------------- -- Records of base_data_store_center -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for base_data_supplier -- ---------------------------- DROP TABLE IF EXISTS `base_data_supplier`; -CREATE TABLE `base_data_supplier` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `mnemonic_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '助记码', - `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人', - `telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', - `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮箱', - `zip_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮编', - `fax` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '传真', - `city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地区ID', - `address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', - `delivery_cycle` int(11) NULL DEFAULT NULL COMMENT '发货周期（天）', - `manage_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '经营方式', - `settle_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算方式', - `credit_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码', - `tax_identify_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '纳税人识别号', - `bank_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户银行', - `account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '户名', - `account_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账号', +CREATE TABLE `base_data_supplier` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `mnemonic_code` varchar(20) NOT NULL COMMENT '简码', + `contact` varchar(100) DEFAULT NULL COMMENT '联系人', + `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', + `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', + `zip_code` varchar(20) DEFAULT NULL COMMENT '邮编', + `fax` varchar(100) DEFAULT NULL COMMENT '传真', + `city_id` varchar(32) DEFAULT NULL COMMENT '地区ID', + `address` varchar(200) DEFAULT NULL COMMENT '地址', + `delivery_cycle` int(11) DEFAULT NULL COMMENT '发货周期（天）', + `manage_type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '经营方式', + `settle_type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '结算方式', + `credit_code` varchar(100) DEFAULT NULL COMMENT '统一社会信用代码', + `tax_identify_no` varchar(100) DEFAULT NULL COMMENT '纳税人识别号', + `bank_name` varchar(100) DEFAULT NULL COMMENT '开户银行', + `account_name` varchar(100) DEFAULT NULL COMMENT '户名', + `account_no` varchar(100) DEFAULT NULL COMMENT '银行账号', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商'; -- ---------------------------- -- Records of base_data_supplier -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_check_sheet -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_check_sheet`; -CREATE TABLE `customer_settle_check_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `total_pay_amount` decimal(24, 2) NOT NULL COMMENT '应付金额', - `total_payed_amount` decimal(24, 2) NOT NULL COMMENT '已付金额', - `total_discount_amount` decimal(24, 2) NOT NULL COMMENT '已优惠金额', +CREATE TABLE `customer_settle_check_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `total_pay_amount` decimal(24,2) NOT NULL COMMENT '应付金额', + `total_payed_amount` decimal(24,2) NOT NULL COMMENT '已付金额', + `total_discount_amount` decimal(24,2) NOT NULL COMMENT '已优惠金额', `start_date` date NOT NULL COMMENT '起始日期', `end_date` date NOT NULL COMMENT '截止日期', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户对账单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户对账单'; -- ---------------------------- -- Records of customer_settle_check_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_check_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_check_sheet_detail`; -CREATE TABLE `customer_settle_check_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对账单ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', +CREATE TABLE `customer_settle_check_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '对账单ID', + `biz_id` varchar(32) NOT NULL COMMENT '单据ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', `calc_type` tinyint(3) NOT NULL COMMENT '计算类型', - `pay_amount` decimal(24, 2) NOT NULL COMMENT '应付金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `pay_amount` decimal(24,2) NOT NULL COMMENT '应付金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `biz_id`) USING BTREE, - INDEX `biz_id`(`biz_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户对账单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`biz_id`) USING BTREE, + KEY `biz_id` (`biz_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户对账单明细'; -- ---------------------------- -- Records of customer_settle_check_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_fee_sheet -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_fee_sheet`; -CREATE TABLE `customer_settle_fee_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', +CREATE TABLE `customer_settle_fee_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', `sheet_type` tinyint(3) NOT NULL COMMENT '单据类型', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户费用单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户费用单'; -- ---------------------------- -- Records of customer_settle_fee_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_fee_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_fee_sheet_detail`; -CREATE TABLE `customer_settle_fee_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用单ID', - `item_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID', - `amount` decimal(24, 2) NOT NULL COMMENT '金额', +CREATE TABLE `customer_settle_fee_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '费用单ID', + `item_id` varchar(32) NOT NULL COMMENT '项目ID', + `amount` decimal(24,2) NOT NULL COMMENT '金额', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `item_id`) USING BTREE, - INDEX `item_id`(`item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户费用单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`item_id`) USING BTREE, + KEY `item_id` (`item_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户费用单明细'; -- ---------------------------- -- Records of customer_settle_fee_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_pre_sheet -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_pre_sheet`; -CREATE TABLE `customer_settle_pre_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `customer_settle_pre_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户预付款单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户预付款单'; -- ---------------------------- -- Records of customer_settle_pre_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_pre_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_pre_sheet_detail`; -CREATE TABLE `customer_settle_pre_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预付款单ID', - `item_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID', - `amount` decimal(24, 2) NOT NULL COMMENT '金额', +CREATE TABLE `customer_settle_pre_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '预付款单ID', + `item_id` varchar(32) NOT NULL COMMENT '项目ID', + `amount` decimal(24,2) NOT NULL COMMENT '金额', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `item_id`) USING BTREE, - INDEX `item_id`(`item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户预付款单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`item_id`) USING BTREE, + KEY `item_id` (`item_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户预付款单明细'; -- ---------------------------- -- Records of customer_settle_pre_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_sheet -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_sheet`; -CREATE TABLE `customer_settle_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `total_discount_amount` decimal(24, 2) NOT NULL COMMENT '已优惠金额', +CREATE TABLE `customer_settle_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `total_discount_amount` decimal(24,2) NOT NULL COMMENT '已优惠金额', `start_date` date NOT NULL COMMENT '起始日期', `end_date` date NOT NULL COMMENT '截止日期', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户结算单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户结算单'; -- ---------------------------- -- Records of customer_settle_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for customer_settle_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `customer_settle_sheet_detail`; -CREATE TABLE `customer_settle_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '结算单ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', - `pay_amount` decimal(24, 2) NOT NULL COMMENT '实付金额', - `discount_amount` decimal(24, 2) NOT NULL COMMENT '优惠金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', +CREATE TABLE `customer_settle_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '结算单ID', + `biz_id` varchar(32) NOT NULL COMMENT '单据ID', + `pay_amount` decimal(24,2) NOT NULL COMMENT '实付金额', + `discount_amount` decimal(24,2) NOT NULL COMMENT '优惠金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `biz_id`) USING BTREE, - INDEX `biz_id`(`biz_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '客户结算单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`biz_id`) USING BTREE, + KEY `biz_id` (`biz_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='客户结算单明细'; -- ---------------------------- -- Records of customer_settle_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for dic_city -- ---------------------------- DROP TABLE IF EXISTS `dic_city`; -CREATE TABLE `dic_city` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID', +CREATE TABLE `dic_city` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `parent_id` varchar(32) DEFAULT NULL COMMENT '父级ID', `level` int(11) NOT NULL COMMENT '层级', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `parent_id`(`parent_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '地区字典表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `parent_id` (`parent_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='地区字典表'; -- ---------------------------- -- Records of dic_city -- ---------------------------- -INSERT INTO `dic_city` VALUES ('11', '11', '北京市', NULL, 1); -INSERT INTO `dic_city` VALUES ('1101', '1101', '市辖区', '11', 2); -INSERT INTO `dic_city` VALUES ('110101', '110101', '东城区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110102', '110102', '西城区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110105', '110105', '朝阳区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110106', '110106', '丰台区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110107', '110107', '石景山区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110108', '110108', '海淀区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110109', '110109', '门头沟区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110111', '110111', '房山区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110112', '110112', '通州区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110113', '110113', '顺义区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110114', '110114', '昌平区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110115', '110115', '大兴区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110116', '110116', '怀柔区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110117', '110117', '平谷区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110118', '110118', '密云区', '1101', 3); -INSERT INTO `dic_city` VALUES ('110119', '110119', '延庆区', '1101', 3); -INSERT INTO `dic_city` VALUES ('12', '12', '天津市', NULL, 1); -INSERT INTO `dic_city` VALUES ('1201', '1201', '市辖区', '12', 2); -INSERT INTO `dic_city` VALUES ('120101', '120101', '和平区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120102', '120102', '河东区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120103', '120103', '河西区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120104', '120104', '南开区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120105', '120105', '河北区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120106', '120106', '红桥区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120110', '120110', '东丽区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120111', '120111', '西青区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120112', '120112', '津南区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120113', '120113', '北辰区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120114', '120114', '武清区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120115', '120115', '宝坻区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120116', '120116', '滨海新区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120117', '120117', '宁河区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120118', '120118', '静海区', '1201', 3); -INSERT INTO `dic_city` VALUES ('120119', '120119', '蓟州区', '1201', 3); -INSERT INTO `dic_city` VALUES ('13', '13', '河北省', NULL, 1); -INSERT INTO `dic_city` VALUES ('1301', '1301', '石家庄市', '13', 2); -INSERT INTO `dic_city` VALUES ('130102', '130102', '长安区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130104', '130104', '桥西区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130105', '130105', '新华区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130107', '130107', '井陉矿区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130108', '130108', '裕华区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130109', '130109', '藁城区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130110', '130110', '鹿泉区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130111', '130111', '栾城区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130121', '130121', '井陉县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130123', '130123', '正定县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130125', '130125', '行唐县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130126', '130126', '灵寿县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130127', '130127', '高邑县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130128', '130128', '深泽县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130129', '130129', '赞皇县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130130', '130130', '无极县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130131', '130131', '平山县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130132', '130132', '元氏县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130133', '130133', '赵县', '1301', 3); -INSERT INTO `dic_city` VALUES ('130171', '130171', '石家庄高新技术产业开发区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130172', '130172', '石家庄循环化工园区', '1301', 3); -INSERT INTO `dic_city` VALUES ('130181', '130181', '辛集市', '1301', 3); -INSERT INTO `dic_city` VALUES ('130183', '130183', '晋州市', '1301', 3); -INSERT INTO `dic_city` VALUES ('130184', '130184', '新乐市', '1301', 3); -INSERT INTO `dic_city` VALUES ('1302', '1302', '唐山市', '13', 2); -INSERT INTO `dic_city` VALUES ('130202', '130202', '路南区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130203', '130203', '路北区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130204', '130204', '古冶区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130205', '130205', '开平区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130207', '130207', '丰南区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130208', '130208', '丰润区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130209', '130209', '曹妃甸区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130224', '130224', '滦南县', '1302', 3); -INSERT INTO `dic_city` VALUES ('130225', '130225', '乐亭县', '1302', 3); -INSERT INTO `dic_city` VALUES ('130227', '130227', '迁西县', '1302', 3); -INSERT INTO `dic_city` VALUES ('130229', '130229', '玉田县', '1302', 3); -INSERT INTO `dic_city` VALUES ('130271', '130271', '河北唐山芦台经济开发区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130272', '130272', '唐山市汉沽管理区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130273', '130273', '唐山高新技术产业开发区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130274', '130274', '河北唐山海港经济开发区', '1302', 3); -INSERT INTO `dic_city` VALUES ('130281', '130281', '遵化市', '1302', 3); -INSERT INTO `dic_city` VALUES ('130283', '130283', '迁安市', '1302', 3); -INSERT INTO `dic_city` VALUES ('130284', '130284', '滦州市', '1302', 3); -INSERT INTO `dic_city` VALUES ('1303', '1303', '秦皇岛市', '13', 2); -INSERT INTO `dic_city` VALUES ('130302', '130302', '海港区', '1303', 3); -INSERT INTO `dic_city` VALUES ('130303', '130303', '山海关区', '1303', 3); -INSERT INTO `dic_city` VALUES ('130304', '130304', '北戴河区', '1303', 3); -INSERT INTO `dic_city` VALUES ('130306', '130306', '抚宁区', '1303', 3); -INSERT INTO `dic_city` VALUES ('130321', '130321', '青龙满族自治县', '1303', 3); -INSERT INTO `dic_city` VALUES ('130322', '130322', '昌黎县', '1303', 3); -INSERT INTO `dic_city` VALUES ('130324', '130324', '卢龙县', '1303', 3); -INSERT INTO `dic_city` VALUES ('130371', '130371', '秦皇岛市经济技术开发区', '1303', 3); -INSERT INTO `dic_city` VALUES ('130372', '130372', '北戴河新区', '1303', 3); -INSERT INTO `dic_city` VALUES ('1304', '1304', '邯郸市', '13', 2); -INSERT INTO `dic_city` VALUES ('130402', '130402', '邯山区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130403', '130403', '丛台区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130404', '130404', '复兴区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130406', '130406', '峰峰矿区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130407', '130407', '肥乡区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130408', '130408', '永年区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130423', '130423', '临漳县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130424', '130424', '成安县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130425', '130425', '大名县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130426', '130426', '涉县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130427', '130427', '磁县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130430', '130430', '邱县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130431', '130431', '鸡泽县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130432', '130432', '广平县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130433', '130433', '馆陶县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130434', '130434', '魏县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130435', '130435', '曲周县', '1304', 3); -INSERT INTO `dic_city` VALUES ('130471', '130471', '邯郸经济技术开发区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130473', '130473', '邯郸冀南新区', '1304', 3); -INSERT INTO `dic_city` VALUES ('130481', '130481', '武安市', '1304', 3); -INSERT INTO `dic_city` VALUES ('1305', '1305', '邢台市', '13', 2); -INSERT INTO `dic_city` VALUES ('130502', '130502', '襄都区', '1305', 3); -INSERT INTO `dic_city` VALUES ('130503', '130503', '信都区', '1305', 3); -INSERT INTO `dic_city` VALUES ('130505', '130505', '任泽区', '1305', 3); -INSERT INTO `dic_city` VALUES ('130506', '130506', '南和区', '1305', 3); -INSERT INTO `dic_city` VALUES ('130522', '130522', '临城县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130523', '130523', '内丘县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130524', '130524', '柏乡县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130525', '130525', '隆尧县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130528', '130528', '宁晋县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130529', '130529', '巨鹿县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130530', '130530', '新河县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130531', '130531', '广宗县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130532', '130532', '平乡县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130533', '130533', '威县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130534', '130534', '清河县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130535', '130535', '临西县', '1305', 3); -INSERT INTO `dic_city` VALUES ('130571', '130571', '河北邢台经济开发区', '1305', 3); -INSERT INTO `dic_city` VALUES ('130581', '130581', '南宫市', '1305', 3); -INSERT INTO `dic_city` VALUES ('130582', '130582', '沙河市', '1305', 3); -INSERT INTO `dic_city` VALUES ('1306', '1306', '保定市', '13', 2); -INSERT INTO `dic_city` VALUES ('130602', '130602', '竞秀区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130606', '130606', '莲池区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130607', '130607', '满城区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130608', '130608', '清苑区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130609', '130609', '徐水区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130623', '130623', '涞水县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130624', '130624', '阜平县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130626', '130626', '定兴县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130627', '130627', '唐县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130628', '130628', '高阳县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130629', '130629', '容城县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130630', '130630', '涞源县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130631', '130631', '望都县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130632', '130632', '安新县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130633', '130633', '易县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130634', '130634', '曲阳县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130635', '130635', '蠡县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130636', '130636', '顺平县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130637', '130637', '博野县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130638', '130638', '雄县', '1306', 3); -INSERT INTO `dic_city` VALUES ('130671', '130671', '保定高新技术产业开发区', '1306', 3); -INSERT INTO `dic_city` VALUES ('130672', '130672', '保定白沟新城', '1306', 3); -INSERT INTO `dic_city` VALUES ('130681', '130681', '涿州市', '1306', 3); -INSERT INTO `dic_city` VALUES ('130682', '130682', '定州市', '1306', 3); -INSERT INTO `dic_city` VALUES ('130683', '130683', '安国市', '1306', 3); -INSERT INTO `dic_city` VALUES ('130684', '130684', '高碑店市', '1306', 3); -INSERT INTO `dic_city` VALUES ('1307', '1307', '张家口市', '13', 2); -INSERT INTO `dic_city` VALUES ('130702', '130702', '桥东区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130703', '130703', '桥西区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130705', '130705', '宣化区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130706', '130706', '下花园区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130708', '130708', '万全区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130709', '130709', '崇礼区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130722', '130722', '张北县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130723', '130723', '康保县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130724', '130724', '沽源县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130725', '130725', '尚义县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130726', '130726', '蔚县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130727', '130727', '阳原县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130728', '130728', '怀安县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130730', '130730', '怀来县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130731', '130731', '涿鹿县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130732', '130732', '赤城县', '1307', 3); -INSERT INTO `dic_city` VALUES ('130771', '130771', '张家口经济开发区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130772', '130772', '张家口市察北管理区', '1307', 3); -INSERT INTO `dic_city` VALUES ('130773', '130773', '张家口市塞北管理区', '1307', 3); -INSERT INTO `dic_city` VALUES ('1308', '1308', '承德市', '13', 2); -INSERT INTO `dic_city` VALUES ('130802', '130802', '双桥区', '1308', 3); -INSERT INTO `dic_city` VALUES ('130803', '130803', '双滦区', '1308', 3); -INSERT INTO `dic_city` VALUES ('130804', '130804', '鹰手营子矿区', '1308', 3); -INSERT INTO `dic_city` VALUES ('130821', '130821', '承德县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130822', '130822', '兴隆县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130824', '130824', '滦平县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130825', '130825', '隆化县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130826', '130826', '丰宁满族自治县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130827', '130827', '宽城满族自治县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130828', '130828', '围场满族蒙古族自治县', '1308', 3); -INSERT INTO `dic_city` VALUES ('130871', '130871', '承德高新技术产业开发区', '1308', 3); -INSERT INTO `dic_city` VALUES ('130881', '130881', '平泉市', '1308', 3); -INSERT INTO `dic_city` VALUES ('1309', '1309', '沧州市', '13', 2); -INSERT INTO `dic_city` VALUES ('130902', '130902', '新华区', '1309', 3); -INSERT INTO `dic_city` VALUES ('130903', '130903', '运河区', '1309', 3); -INSERT INTO `dic_city` VALUES ('130921', '130921', '沧县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130922', '130922', '青县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130923', '130923', '东光县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130924', '130924', '海兴县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130925', '130925', '盐山县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130926', '130926', '肃宁县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130927', '130927', '南皮县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130928', '130928', '吴桥县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130929', '130929', '献县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130930', '130930', '孟村回族自治县', '1309', 3); -INSERT INTO `dic_city` VALUES ('130971', '130971', '河北沧州经济开发区', '1309', 3); -INSERT INTO `dic_city` VALUES ('130972', '130972', '沧州高新技术产业开发区', '1309', 3); -INSERT INTO `dic_city` VALUES ('130973', '130973', '沧州渤海新区', '1309', 3); -INSERT INTO `dic_city` VALUES ('130981', '130981', '泊头市', '1309', 3); -INSERT INTO `dic_city` VALUES ('130982', '130982', '任丘市', '1309', 3); -INSERT INTO `dic_city` VALUES ('130983', '130983', '黄骅市', '1309', 3); -INSERT INTO `dic_city` VALUES ('130984', '130984', '河间市', '1309', 3); -INSERT INTO `dic_city` VALUES ('1310', '1310', '廊坊市', '13', 2); -INSERT INTO `dic_city` VALUES ('131002', '131002', '安次区', '1310', 3); -INSERT INTO `dic_city` VALUES ('131003', '131003', '广阳区', '1310', 3); -INSERT INTO `dic_city` VALUES ('131022', '131022', '固安县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131023', '131023', '永清县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131024', '131024', '香河县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131025', '131025', '大城县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131026', '131026', '文安县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131028', '131028', '大厂回族自治县', '1310', 3); -INSERT INTO `dic_city` VALUES ('131071', '131071', '廊坊经济技术开发区', '1310', 3); -INSERT INTO `dic_city` VALUES ('131081', '131081', '霸州市', '1310', 3); -INSERT INTO `dic_city` VALUES ('131082', '131082', '三河市', '1310', 3); -INSERT INTO `dic_city` VALUES ('1311', '1311', '衡水市', '13', 2); -INSERT INTO `dic_city` VALUES ('131102', '131102', '桃城区', '1311', 3); -INSERT INTO `dic_city` VALUES ('131103', '131103', '冀州区', '1311', 3); -INSERT INTO `dic_city` VALUES ('131121', '131121', '枣强县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131122', '131122', '武邑县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131123', '131123', '武强县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131124', '131124', '饶阳县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131125', '131125', '安平县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131126', '131126', '故城县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131127', '131127', '景县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131128', '131128', '阜城县', '1311', 3); -INSERT INTO `dic_city` VALUES ('131171', '131171', '河北衡水高新技术产业开发区', '1311', 3); -INSERT INTO `dic_city` VALUES ('131172', '131172', '衡水滨湖新区', '1311', 3); -INSERT INTO `dic_city` VALUES ('131182', '131182', '深州市', '1311', 3); -INSERT INTO `dic_city` VALUES ('14', '14', '山西省', NULL, 1); -INSERT INTO `dic_city` VALUES ('1401', '1401', '太原市', '14', 2); -INSERT INTO `dic_city` VALUES ('140105', '140105', '小店区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140106', '140106', '迎泽区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140107', '140107', '杏花岭区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140108', '140108', '尖草坪区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140109', '140109', '万柏林区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140110', '140110', '晋源区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140121', '140121', '清徐县', '1401', 3); -INSERT INTO `dic_city` VALUES ('140122', '140122', '阳曲县', '1401', 3); -INSERT INTO `dic_city` VALUES ('140123', '140123', '娄烦县', '1401', 3); -INSERT INTO `dic_city` VALUES ('140171', '140171', '山西转型综合改革示范区', '1401', 3); -INSERT INTO `dic_city` VALUES ('140181', '140181', '古交市', '1401', 3); -INSERT INTO `dic_city` VALUES ('1402', '1402', '大同市', '14', 2); -INSERT INTO `dic_city` VALUES ('140212', '140212', '新荣区', '1402', 3); -INSERT INTO `dic_city` VALUES ('140213', '140213', '平城区', '1402', 3); -INSERT INTO `dic_city` VALUES ('140214', '140214', '云冈区', '1402', 3); -INSERT INTO `dic_city` VALUES ('140215', '140215', '云州区', '1402', 3); -INSERT INTO `dic_city` VALUES ('140221', '140221', '阳高县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140222', '140222', '天镇县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140223', '140223', '广灵县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140224', '140224', '灵丘县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140225', '140225', '浑源县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140226', '140226', '左云县', '1402', 3); -INSERT INTO `dic_city` VALUES ('140271', '140271', '山西大同经济开发区', '1402', 3); -INSERT INTO `dic_city` VALUES ('1403', '1403', '阳泉市', '14', 2); -INSERT INTO `dic_city` VALUES ('140302', '140302', '城区', '1403', 3); -INSERT INTO `dic_city` VALUES ('140303', '140303', '矿区', '1403', 3); -INSERT INTO `dic_city` VALUES ('140311', '140311', '郊区', '1403', 3); -INSERT INTO `dic_city` VALUES ('140321', '140321', '平定县', '1403', 3); -INSERT INTO `dic_city` VALUES ('140322', '140322', '盂县', '1403', 3); -INSERT INTO `dic_city` VALUES ('1404', '1404', '长治市', '14', 2); -INSERT INTO `dic_city` VALUES ('140403', '140403', '潞州区', '1404', 3); -INSERT INTO `dic_city` VALUES ('140404', '140404', '上党区', '1404', 3); -INSERT INTO `dic_city` VALUES ('140405', '140405', '屯留区', '1404', 3); -INSERT INTO `dic_city` VALUES ('140406', '140406', '潞城区', '1404', 3); -INSERT INTO `dic_city` VALUES ('140423', '140423', '襄垣县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140425', '140425', '平顺县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140426', '140426', '黎城县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140427', '140427', '壶关县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140428', '140428', '长子县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140429', '140429', '武乡县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140430', '140430', '沁县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140431', '140431', '沁源县', '1404', 3); -INSERT INTO `dic_city` VALUES ('140471', '140471', '山西长治高新技术产业园区', '1404', 3); -INSERT INTO `dic_city` VALUES ('1405', '1405', '晋城市', '14', 2); -INSERT INTO `dic_city` VALUES ('140502', '140502', '城区', '1405', 3); -INSERT INTO `dic_city` VALUES ('140521', '140521', '沁水县', '1405', 3); -INSERT INTO `dic_city` VALUES ('140522', '140522', '阳城县', '1405', 3); -INSERT INTO `dic_city` VALUES ('140524', '140524', '陵川县', '1405', 3); -INSERT INTO `dic_city` VALUES ('140525', '140525', '泽州县', '1405', 3); -INSERT INTO `dic_city` VALUES ('140581', '140581', '高平市', '1405', 3); -INSERT INTO `dic_city` VALUES ('1406', '1406', '朔州市', '14', 2); -INSERT INTO `dic_city` VALUES ('140602', '140602', '朔城区', '1406', 3); -INSERT INTO `dic_city` VALUES ('140603', '140603', '平鲁区', '1406', 3); -INSERT INTO `dic_city` VALUES ('140621', '140621', '山阴县', '1406', 3); -INSERT INTO `dic_city` VALUES ('140622', '140622', '应县', '1406', 3); -INSERT INTO `dic_city` VALUES ('140623', '140623', '右玉县', '1406', 3); -INSERT INTO `dic_city` VALUES ('140671', '140671', '山西朔州经济开发区', '1406', 3); -INSERT INTO `dic_city` VALUES ('140681', '140681', '怀仁市', '1406', 3); -INSERT INTO `dic_city` VALUES ('1407', '1407', '晋中市', '14', 2); -INSERT INTO `dic_city` VALUES ('140702', '140702', '榆次区', '1407', 3); -INSERT INTO `dic_city` VALUES ('140703', '140703', '太谷区', '1407', 3); -INSERT INTO `dic_city` VALUES ('140721', '140721', '榆社县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140722', '140722', '左权县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140723', '140723', '和顺县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140724', '140724', '昔阳县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140725', '140725', '寿阳县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140727', '140727', '祁县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140728', '140728', '平遥县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140729', '140729', '灵石县', '1407', 3); -INSERT INTO `dic_city` VALUES ('140781', '140781', '介休市', '1407', 3); -INSERT INTO `dic_city` VALUES ('1408', '1408', '运城市', '14', 2); -INSERT INTO `dic_city` VALUES ('140802', '140802', '盐湖区', '1408', 3); -INSERT INTO `dic_city` VALUES ('140821', '140821', '临猗县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140822', '140822', '万荣县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140823', '140823', '闻喜县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140824', '140824', '稷山县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140825', '140825', '新绛县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140826', '140826', '绛县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140827', '140827', '垣曲县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140828', '140828', '夏县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140829', '140829', '平陆县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140830', '140830', '芮城县', '1408', 3); -INSERT INTO `dic_city` VALUES ('140881', '140881', '永济市', '1408', 3); -INSERT INTO `dic_city` VALUES ('140882', '140882', '河津市', '1408', 3); -INSERT INTO `dic_city` VALUES ('1409', '1409', '忻州市', '14', 2); -INSERT INTO `dic_city` VALUES ('140902', '140902', '忻府区', '1409', 3); -INSERT INTO `dic_city` VALUES ('140921', '140921', '定襄县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140922', '140922', '五台县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140923', '140923', '代县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140924', '140924', '繁峙县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140925', '140925', '宁武县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140926', '140926', '静乐县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140927', '140927', '神池县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140928', '140928', '五寨县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140929', '140929', '岢岚县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140930', '140930', '河曲县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140931', '140931', '保德县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140932', '140932', '偏关县', '1409', 3); -INSERT INTO `dic_city` VALUES ('140971', '140971', '五台山风景名胜区', '1409', 3); -INSERT INTO `dic_city` VALUES ('140981', '140981', '原平市', '1409', 3); -INSERT INTO `dic_city` VALUES ('1410', '1410', '临汾市', '14', 2); -INSERT INTO `dic_city` VALUES ('141002', '141002', '尧都区', '1410', 3); -INSERT INTO `dic_city` VALUES ('141021', '141021', '曲沃县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141022', '141022', '翼城县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141023', '141023', '襄汾县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141024', '141024', '洪洞县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141025', '141025', '古县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141026', '141026', '安泽县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141027', '141027', '浮山县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141028', '141028', '吉县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141029', '141029', '乡宁县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141030', '141030', '大宁县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141031', '141031', '隰县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141032', '141032', '永和县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141033', '141033', '蒲县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141034', '141034', '汾西县', '1410', 3); -INSERT INTO `dic_city` VALUES ('141081', '141081', '侯马市', '1410', 3); -INSERT INTO `dic_city` VALUES ('141082', '141082', '霍州市', '1410', 3); -INSERT INTO `dic_city` VALUES ('1411', '1411', '吕梁市', '14', 2); -INSERT INTO `dic_city` VALUES ('141102', '141102', '离石区', '1411', 3); -INSERT INTO `dic_city` VALUES ('141121', '141121', '文水县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141122', '141122', '交城县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141123', '141123', '兴县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141124', '141124', '临县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141125', '141125', '柳林县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141126', '141126', '石楼县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141127', '141127', '岚县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141128', '141128', '方山县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141129', '141129', '中阳县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141130', '141130', '交口县', '1411', 3); -INSERT INTO `dic_city` VALUES ('141181', '141181', '孝义市', '1411', 3); -INSERT INTO `dic_city` VALUES ('141182', '141182', '汾阳市', '1411', 3); -INSERT INTO `dic_city` VALUES ('15', '15', '内蒙古自治区', NULL, 1); -INSERT INTO `dic_city` VALUES ('1501', '1501', '呼和浩特市', '15', 2); -INSERT INTO `dic_city` VALUES ('150102', '150102', '新城区', '1501', 3); -INSERT INTO `dic_city` VALUES ('150103', '150103', '回民区', '1501', 3); -INSERT INTO `dic_city` VALUES ('150104', '150104', '玉泉区', '1501', 3); -INSERT INTO `dic_city` VALUES ('150105', '150105', '赛罕区', '1501', 3); -INSERT INTO `dic_city` VALUES ('150121', '150121', '土默特左旗', '1501', 3); -INSERT INTO `dic_city` VALUES ('150122', '150122', '托克托县', '1501', 3); -INSERT INTO `dic_city` VALUES ('150123', '150123', '和林格尔县', '1501', 3); -INSERT INTO `dic_city` VALUES ('150124', '150124', '清水河县', '1501', 3); -INSERT INTO `dic_city` VALUES ('150125', '150125', '武川县', '1501', 3); -INSERT INTO `dic_city` VALUES ('150172', '150172', '呼和浩特经济技术开发区', '1501', 3); -INSERT INTO `dic_city` VALUES ('1502', '1502', '包头市', '15', 2); -INSERT INTO `dic_city` VALUES ('150202', '150202', '东河区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150203', '150203', '昆都仑区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150204', '150204', '青山区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150205', '150205', '石拐区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150206', '150206', '白云鄂博矿区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150207', '150207', '九原区', '1502', 3); -INSERT INTO `dic_city` VALUES ('150221', '150221', '土默特右旗', '1502', 3); -INSERT INTO `dic_city` VALUES ('150222', '150222', '固阳县', '1502', 3); -INSERT INTO `dic_city` VALUES ('150223', '150223', '达尔罕茂明安联合旗', '1502', 3); -INSERT INTO `dic_city` VALUES ('150271', '150271', '包头稀土高新技术产业开发区', '1502', 3); -INSERT INTO `dic_city` VALUES ('1503', '1503', '乌海市', '15', 2); -INSERT INTO `dic_city` VALUES ('150302', '150302', '海勃湾区', '1503', 3); -INSERT INTO `dic_city` VALUES ('150303', '150303', '海南区', '1503', 3); -INSERT INTO `dic_city` VALUES ('150304', '150304', '乌达区', '1503', 3); -INSERT INTO `dic_city` VALUES ('1504', '1504', '赤峰市', '15', 2); -INSERT INTO `dic_city` VALUES ('150402', '150402', '红山区', '1504', 3); -INSERT INTO `dic_city` VALUES ('150403', '150403', '元宝山区', '1504', 3); -INSERT INTO `dic_city` VALUES ('150404', '150404', '松山区', '1504', 3); -INSERT INTO `dic_city` VALUES ('150421', '150421', '阿鲁科尔沁旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150422', '150422', '巴林左旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150423', '150423', '巴林右旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150424', '150424', '林西县', '1504', 3); -INSERT INTO `dic_city` VALUES ('150425', '150425', '克什克腾旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150426', '150426', '翁牛特旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150428', '150428', '喀喇沁旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('150429', '150429', '宁城县', '1504', 3); -INSERT INTO `dic_city` VALUES ('150430', '150430', '敖汉旗', '1504', 3); -INSERT INTO `dic_city` VALUES ('1505', '1505', '通辽市', '15', 2); -INSERT INTO `dic_city` VALUES ('150502', '150502', '科尔沁区', '1505', 3); -INSERT INTO `dic_city` VALUES ('150521', '150521', '科尔沁左翼中旗', '1505', 3); -INSERT INTO `dic_city` VALUES ('150522', '150522', '科尔沁左翼后旗', '1505', 3); -INSERT INTO `dic_city` VALUES ('150523', '150523', '开鲁县', '1505', 3); -INSERT INTO `dic_city` VALUES ('150524', '150524', '库伦旗', '1505', 3); -INSERT INTO `dic_city` VALUES ('150525', '150525', '奈曼旗', '1505', 3); -INSERT INTO `dic_city` VALUES ('150526', '150526', '扎鲁特旗', '1505', 3); -INSERT INTO `dic_city` VALUES ('150571', '150571', '通辽经济技术开发区', '1505', 3); -INSERT INTO `dic_city` VALUES ('150581', '150581', '霍林郭勒市', '1505', 3); -INSERT INTO `dic_city` VALUES ('1506', '1506', '鄂尔多斯市', '15', 2); -INSERT INTO `dic_city` VALUES ('150602', '150602', '东胜区', '1506', 3); -INSERT INTO `dic_city` VALUES ('150603', '150603', '康巴什区', '1506', 3); -INSERT INTO `dic_city` VALUES ('150621', '150621', '达拉特旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150622', '150622', '准格尔旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150623', '150623', '鄂托克前旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150624', '150624', '鄂托克旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150625', '150625', '杭锦旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150626', '150626', '乌审旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('150627', '150627', '伊金霍洛旗', '1506', 3); -INSERT INTO `dic_city` VALUES ('1507', '1507', '呼伦贝尔市', '15', 2); -INSERT INTO `dic_city` VALUES ('150702', '150702', '海拉尔区', '1507', 3); -INSERT INTO `dic_city` VALUES ('150703', '150703', '扎赉诺尔区', '1507', 3); -INSERT INTO `dic_city` VALUES ('150721', '150721', '阿荣旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150722', '150722', '莫力达瓦达斡尔族自治旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150723', '150723', '鄂伦春自治旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150724', '150724', '鄂温克族自治旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150725', '150725', '陈巴尔虎旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150726', '150726', '新巴尔虎左旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150727', '150727', '新巴尔虎右旗', '1507', 3); -INSERT INTO `dic_city` VALUES ('150781', '150781', '满洲里市', '1507', 3); -INSERT INTO `dic_city` VALUES ('150782', '150782', '牙克石市', '1507', 3); -INSERT INTO `dic_city` VALUES ('150783', '150783', '扎兰屯市', '1507', 3); -INSERT INTO `dic_city` VALUES ('150784', '150784', '额尔古纳市', '1507', 3); -INSERT INTO `dic_city` VALUES ('150785', '150785', '根河市', '1507', 3); -INSERT INTO `dic_city` VALUES ('1508', '1508', '巴彦淖尔市', '15', 2); -INSERT INTO `dic_city` VALUES ('150802', '150802', '临河区', '1508', 3); -INSERT INTO `dic_city` VALUES ('150821', '150821', '五原县', '1508', 3); -INSERT INTO `dic_city` VALUES ('150822', '150822', '磴口县', '1508', 3); -INSERT INTO `dic_city` VALUES ('150823', '150823', '乌拉特前旗', '1508', 3); -INSERT INTO `dic_city` VALUES ('150824', '150824', '乌拉特中旗', '1508', 3); -INSERT INTO `dic_city` VALUES ('150825', '150825', '乌拉特后旗', '1508', 3); -INSERT INTO `dic_city` VALUES ('150826', '150826', '杭锦后旗', '1508', 3); -INSERT INTO `dic_city` VALUES ('1509', '1509', '乌兰察布市', '15', 2); -INSERT INTO `dic_city` VALUES ('150902', '150902', '集宁区', '1509', 3); -INSERT INTO `dic_city` VALUES ('150921', '150921', '卓资县', '1509', 3); -INSERT INTO `dic_city` VALUES ('150922', '150922', '化德县', '1509', 3); -INSERT INTO `dic_city` VALUES ('150923', '150923', '商都县', '1509', 3); -INSERT INTO `dic_city` VALUES ('150924', '150924', '兴和县', '1509', 3); -INSERT INTO `dic_city` VALUES ('150925', '150925', '凉城县', '1509', 3); -INSERT INTO `dic_city` VALUES ('150926', '150926', '察哈尔右翼前旗', '1509', 3); -INSERT INTO `dic_city` VALUES ('150927', '150927', '察哈尔右翼中旗', '1509', 3); -INSERT INTO `dic_city` VALUES ('150928', '150928', '察哈尔右翼后旗', '1509', 3); -INSERT INTO `dic_city` VALUES ('150929', '150929', '四子王旗', '1509', 3); -INSERT INTO `dic_city` VALUES ('150981', '150981', '丰镇市', '1509', 3); -INSERT INTO `dic_city` VALUES ('1522', '1522', '兴安盟', '15', 2); -INSERT INTO `dic_city` VALUES ('152201', '152201', '乌兰浩特市', '1522', 3); -INSERT INTO `dic_city` VALUES ('152202', '152202', '阿尔山市', '1522', 3); -INSERT INTO `dic_city` VALUES ('152221', '152221', '科尔沁右翼前旗', '1522', 3); -INSERT INTO `dic_city` VALUES ('152222', '152222', '科尔沁右翼中旗', '1522', 3); -INSERT INTO `dic_city` VALUES ('152223', '152223', '扎赉特旗', '1522', 3); -INSERT INTO `dic_city` VALUES ('152224', '152224', '突泉县', '1522', 3); -INSERT INTO `dic_city` VALUES ('1525', '1525', '锡林郭勒盟', '15', 2); -INSERT INTO `dic_city` VALUES ('152501', '152501', '二连浩特市', '1525', 3); -INSERT INTO `dic_city` VALUES ('152502', '152502', '锡林浩特市', '1525', 3); -INSERT INTO `dic_city` VALUES ('152522', '152522', '阿巴嘎旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152523', '152523', '苏尼特左旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152524', '152524', '苏尼特右旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152525', '152525', '东乌珠穆沁旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152526', '152526', '西乌珠穆沁旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152527', '152527', '太仆寺旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152528', '152528', '镶黄旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152529', '152529', '正镶白旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152530', '152530', '正蓝旗', '1525', 3); -INSERT INTO `dic_city` VALUES ('152531', '152531', '多伦县', '1525', 3); -INSERT INTO `dic_city` VALUES ('152571', '152571', '乌拉盖管委会', '1525', 3); -INSERT INTO `dic_city` VALUES ('1529', '1529', '阿拉善盟', '15', 2); -INSERT INTO `dic_city` VALUES ('152921', '152921', '阿拉善左旗', '1529', 3); -INSERT INTO `dic_city` VALUES ('152922', '152922', '阿拉善右旗', '1529', 3); -INSERT INTO `dic_city` VALUES ('152923', '152923', '额济纳旗', '1529', 3); -INSERT INTO `dic_city` VALUES ('152971', '152971', '内蒙古阿拉善经济开发区', '1529', 3); -INSERT INTO `dic_city` VALUES ('21', '21', '辽宁省', NULL, 1); -INSERT INTO `dic_city` VALUES ('2101', '2101', '沈阳市', '21', 2); -INSERT INTO `dic_city` VALUES ('210102', '210102', '和平区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210103', '210103', '沈河区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210104', '210104', '大东区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210105', '210105', '皇姑区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210106', '210106', '铁西区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210111', '210111', '苏家屯区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210112', '210112', '浑南区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210113', '210113', '沈北新区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210114', '210114', '于洪区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210115', '210115', '辽中区', '2101', 3); -INSERT INTO `dic_city` VALUES ('210123', '210123', '康平县', '2101', 3); -INSERT INTO `dic_city` VALUES ('210124', '210124', '法库县', '2101', 3); -INSERT INTO `dic_city` VALUES ('210181', '210181', '新民市', '2101', 3); -INSERT INTO `dic_city` VALUES ('2102', '2102', '大连市', '21', 2); -INSERT INTO `dic_city` VALUES ('210202', '210202', '中山区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210203', '210203', '西岗区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210204', '210204', '沙河口区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210211', '210211', '甘井子区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210212', '210212', '旅顺口区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210213', '210213', '金州区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210214', '210214', '普兰店区', '2102', 3); -INSERT INTO `dic_city` VALUES ('210224', '210224', '长海县', '2102', 3); -INSERT INTO `dic_city` VALUES ('210281', '210281', '瓦房店市', '2102', 3); -INSERT INTO `dic_city` VALUES ('210283', '210283', '庄河市', '2102', 3); -INSERT INTO `dic_city` VALUES ('2103', '2103', '鞍山市', '21', 2); -INSERT INTO `dic_city` VALUES ('210302', '210302', '铁东区', '2103', 3); -INSERT INTO `dic_city` VALUES ('210303', '210303', '铁西区', '2103', 3); -INSERT INTO `dic_city` VALUES ('210304', '210304', '立山区', '2103', 3); -INSERT INTO `dic_city` VALUES ('210311', '210311', '千山区', '2103', 3); -INSERT INTO `dic_city` VALUES ('210321', '210321', '台安县', '2103', 3); -INSERT INTO `dic_city` VALUES ('210323', '210323', '岫岩满族自治县', '2103', 3); -INSERT INTO `dic_city` VALUES ('210381', '210381', '海城市', '2103', 3); -INSERT INTO `dic_city` VALUES ('2104', '2104', '抚顺市', '21', 2); -INSERT INTO `dic_city` VALUES ('210402', '210402', '新抚区', '2104', 3); -INSERT INTO `dic_city` VALUES ('210403', '210403', '东洲区', '2104', 3); -INSERT INTO `dic_city` VALUES ('210404', '210404', '望花区', '2104', 3); -INSERT INTO `dic_city` VALUES ('210411', '210411', '顺城区', '2104', 3); -INSERT INTO `dic_city` VALUES ('210421', '210421', '抚顺县', '2104', 3); -INSERT INTO `dic_city` VALUES ('210422', '210422', '新宾满族自治县', '2104', 3); -INSERT INTO `dic_city` VALUES ('210423', '210423', '清原满族自治县', '2104', 3); -INSERT INTO `dic_city` VALUES ('2105', '2105', '本溪市', '21', 2); -INSERT INTO `dic_city` VALUES ('210502', '210502', '平山区', '2105', 3); -INSERT INTO `dic_city` VALUES ('210503', '210503', '溪湖区', '2105', 3); -INSERT INTO `dic_city` VALUES ('210504', '210504', '明山区', '2105', 3); -INSERT INTO `dic_city` VALUES ('210505', '210505', '南芬区', '2105', 3); -INSERT INTO `dic_city` VALUES ('210521', '210521', '本溪满族自治县', '2105', 3); -INSERT INTO `dic_city` VALUES ('210522', '210522', '桓仁满族自治县', '2105', 3); -INSERT INTO `dic_city` VALUES ('2106', '2106', '丹东市', '21', 2); -INSERT INTO `dic_city` VALUES ('210602', '210602', '元宝区', '2106', 3); -INSERT INTO `dic_city` VALUES ('210603', '210603', '振兴区', '2106', 3); -INSERT INTO `dic_city` VALUES ('210604', '210604', '振安区', '2106', 3); -INSERT INTO `dic_city` VALUES ('210624', '210624', '宽甸满族自治县', '2106', 3); -INSERT INTO `dic_city` VALUES ('210681', '210681', '东港市', '2106', 3); -INSERT INTO `dic_city` VALUES ('210682', '210682', '凤城市', '2106', 3); -INSERT INTO `dic_city` VALUES ('2107', '2107', '锦州市', '21', 2); -INSERT INTO `dic_city` VALUES ('210702', '210702', '古塔区', '2107', 3); -INSERT INTO `dic_city` VALUES ('210703', '210703', '凌河区', '2107', 3); -INSERT INTO `dic_city` VALUES ('210711', '210711', '太和区', '2107', 3); -INSERT INTO `dic_city` VALUES ('210726', '210726', '黑山县', '2107', 3); -INSERT INTO `dic_city` VALUES ('210727', '210727', '义县', '2107', 3); -INSERT INTO `dic_city` VALUES ('210781', '210781', '凌海市', '2107', 3); -INSERT INTO `dic_city` VALUES ('210782', '210782', '北镇市', '2107', 3); -INSERT INTO `dic_city` VALUES ('2108', '2108', '营口市', '21', 2); -INSERT INTO `dic_city` VALUES ('210802', '210802', '站前区', '2108', 3); -INSERT INTO `dic_city` VALUES ('210803', '210803', '西市区', '2108', 3); -INSERT INTO `dic_city` VALUES ('210804', '210804', '鲅鱼圈区', '2108', 3); -INSERT INTO `dic_city` VALUES ('210811', '210811', '老边区', '2108', 3); -INSERT INTO `dic_city` VALUES ('210881', '210881', '盖州市', '2108', 3); -INSERT INTO `dic_city` VALUES ('210882', '210882', '大石桥市', '2108', 3); -INSERT INTO `dic_city` VALUES ('2109', '2109', '阜新市', '21', 2); -INSERT INTO `dic_city` VALUES ('210902', '210902', '海州区', '2109', 3); -INSERT INTO `dic_city` VALUES ('210903', '210903', '新邱区', '2109', 3); -INSERT INTO `dic_city` VALUES ('210904', '210904', '太平区', '2109', 3); -INSERT INTO `dic_city` VALUES ('210905', '210905', '清河门区', '2109', 3); -INSERT INTO `dic_city` VALUES ('210911', '210911', '细河区', '2109', 3); -INSERT INTO `dic_city` VALUES ('210921', '210921', '阜新蒙古族自治县', '2109', 3); -INSERT INTO `dic_city` VALUES ('210922', '210922', '彰武县', '2109', 3); -INSERT INTO `dic_city` VALUES ('2110', '2110', '辽阳市', '21', 2); -INSERT INTO `dic_city` VALUES ('211002', '211002', '白塔区', '2110', 3); -INSERT INTO `dic_city` VALUES ('211003', '211003', '文圣区', '2110', 3); -INSERT INTO `dic_city` VALUES ('211004', '211004', '宏伟区', '2110', 3); -INSERT INTO `dic_city` VALUES ('211005', '211005', '弓长岭区', '2110', 3); -INSERT INTO `dic_city` VALUES ('211011', '211011', '太子河区', '2110', 3); -INSERT INTO `dic_city` VALUES ('211021', '211021', '辽阳县', '2110', 3); -INSERT INTO `dic_city` VALUES ('211081', '211081', '灯塔市', '2110', 3); -INSERT INTO `dic_city` VALUES ('2111', '2111', '盘锦市', '21', 2); -INSERT INTO `dic_city` VALUES ('211102', '211102', '双台子区', '2111', 3); -INSERT INTO `dic_city` VALUES ('211103', '211103', '兴隆台区', '2111', 3); -INSERT INTO `dic_city` VALUES ('211104', '211104', '大洼区', '2111', 3); -INSERT INTO `dic_city` VALUES ('211122', '211122', '盘山县', '2111', 3); -INSERT INTO `dic_city` VALUES ('2112', '2112', '铁岭市', '21', 2); -INSERT INTO `dic_city` VALUES ('211202', '211202', '银州区', '2112', 3); -INSERT INTO `dic_city` VALUES ('211204', '211204', '清河区', '2112', 3); -INSERT INTO `dic_city` VALUES ('211221', '211221', '铁岭县', '2112', 3); -INSERT INTO `dic_city` VALUES ('211223', '211223', '西丰县', '2112', 3); -INSERT INTO `dic_city` VALUES ('211224', '211224', '昌图县', '2112', 3); -INSERT INTO `dic_city` VALUES ('211281', '211281', '调兵山市', '2112', 3); -INSERT INTO `dic_city` VALUES ('211282', '211282', '开原市', '2112', 3); -INSERT INTO `dic_city` VALUES ('2113', '2113', '朝阳市', '21', 2); -INSERT INTO `dic_city` VALUES ('211302', '211302', '双塔区', '2113', 3); -INSERT INTO `dic_city` VALUES ('211303', '211303', '龙城区', '2113', 3); -INSERT INTO `dic_city` VALUES ('211321', '211321', '朝阳县', '2113', 3); -INSERT INTO `dic_city` VALUES ('211322', '211322', '建平县', '2113', 3); -INSERT INTO `dic_city` VALUES ('211324', '211324', '喀喇沁左翼蒙古族自治县', '2113', 3); -INSERT INTO `dic_city` VALUES ('211381', '211381', '北票市', '2113', 3); -INSERT INTO `dic_city` VALUES ('211382', '211382', '凌源市', '2113', 3); -INSERT INTO `dic_city` VALUES ('2114', '2114', '葫芦岛市', '21', 2); -INSERT INTO `dic_city` VALUES ('211402', '211402', '连山区', '2114', 3); -INSERT INTO `dic_city` VALUES ('211403', '211403', '龙港区', '2114', 3); -INSERT INTO `dic_city` VALUES ('211404', '211404', '南票区', '2114', 3); -INSERT INTO `dic_city` VALUES ('211421', '211421', '绥中县', '2114', 3); -INSERT INTO `dic_city` VALUES ('211422', '211422', '建昌县', '2114', 3); -INSERT INTO `dic_city` VALUES ('211481', '211481', '兴城市', '2114', 3); -INSERT INTO `dic_city` VALUES ('22', '22', '吉林省', NULL, 1); -INSERT INTO `dic_city` VALUES ('2201', '2201', '长春市', '22', 2); -INSERT INTO `dic_city` VALUES ('220102', '220102', '南关区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220103', '220103', '宽城区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220104', '220104', '朝阳区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220105', '220105', '二道区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220106', '220106', '绿园区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220112', '220112', '双阳区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220113', '220113', '九台区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220122', '220122', '农安县', '2201', 3); -INSERT INTO `dic_city` VALUES ('220171', '220171', '长春经济技术开发区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220172', '220172', '长春净月高新技术产业开发区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220173', '220173', '长春高新技术产业开发区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220174', '220174', '长春汽车经济技术开发区', '2201', 3); -INSERT INTO `dic_city` VALUES ('220182', '220182', '榆树市', '2201', 3); -INSERT INTO `dic_city` VALUES ('220183', '220183', '德惠市', '2201', 3); -INSERT INTO `dic_city` VALUES ('220184', '220184', '公主岭市', '2201', 3); -INSERT INTO `dic_city` VALUES ('2202', '2202', '吉林市', '22', 2); -INSERT INTO `dic_city` VALUES ('220202', '220202', '昌邑区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220203', '220203', '龙潭区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220204', '220204', '船营区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220211', '220211', '丰满区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220221', '220221', '永吉县', '2202', 3); -INSERT INTO `dic_city` VALUES ('220271', '220271', '吉林经济开发区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220272', '220272', '吉林高新技术产业开发区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220273', '220273', '吉林中国新加坡食品区', '2202', 3); -INSERT INTO `dic_city` VALUES ('220281', '220281', '蛟河市', '2202', 3); -INSERT INTO `dic_city` VALUES ('220282', '220282', '桦甸市', '2202', 3); -INSERT INTO `dic_city` VALUES ('220283', '220283', '舒兰市', '2202', 3); -INSERT INTO `dic_city` VALUES ('220284', '220284', '磐石市', '2202', 3); -INSERT INTO `dic_city` VALUES ('2203', '2203', '四平市', '22', 2); -INSERT INTO `dic_city` VALUES ('220302', '220302', '铁西区', '2203', 3); -INSERT INTO `dic_city` VALUES ('220303', '220303', '铁东区', '2203', 3); -INSERT INTO `dic_city` VALUES ('220322', '220322', '梨树县', '2203', 3); -INSERT INTO `dic_city` VALUES ('220323', '220323', '伊通满族自治县', '2203', 3); -INSERT INTO `dic_city` VALUES ('220382', '220382', '双辽市', '2203', 3); -INSERT INTO `dic_city` VALUES ('2204', '2204', '辽源市', '22', 2); -INSERT INTO `dic_city` VALUES ('220402', '220402', '龙山区', '2204', 3); -INSERT INTO `dic_city` VALUES ('220403', '220403', '西安区', '2204', 3); -INSERT INTO `dic_city` VALUES ('220421', '220421', '东丰县', '2204', 3); -INSERT INTO `dic_city` VALUES ('220422', '220422', '东辽县', '2204', 3); -INSERT INTO `dic_city` VALUES ('2205', '2205', '通化市', '22', 2); -INSERT INTO `dic_city` VALUES ('220502', '220502', '东昌区', '2205', 3); -INSERT INTO `dic_city` VALUES ('220503', '220503', '二道江区', '2205', 3); -INSERT INTO `dic_city` VALUES ('220521', '220521', '通化县', '2205', 3); -INSERT INTO `dic_city` VALUES ('220523', '220523', '辉南县', '2205', 3); -INSERT INTO `dic_city` VALUES ('220524', '220524', '柳河县', '2205', 3); -INSERT INTO `dic_city` VALUES ('220581', '220581', '梅河口市', '2205', 3); -INSERT INTO `dic_city` VALUES ('220582', '220582', '集安市', '2205', 3); -INSERT INTO `dic_city` VALUES ('2206', '2206', '白山市', '22', 2); -INSERT INTO `dic_city` VALUES ('220602', '220602', '浑江区', '2206', 3); -INSERT INTO `dic_city` VALUES ('220605', '220605', '江源区', '2206', 3); -INSERT INTO `dic_city` VALUES ('220621', '220621', '抚松县', '2206', 3); -INSERT INTO `dic_city` VALUES ('220622', '220622', '靖宇县', '2206', 3); -INSERT INTO `dic_city` VALUES ('220623', '220623', '长白朝鲜族自治县', '2206', 3); -INSERT INTO `dic_city` VALUES ('220681', '220681', '临江市', '2206', 3); -INSERT INTO `dic_city` VALUES ('2207', '2207', '松原市', '22', 2); -INSERT INTO `dic_city` VALUES ('220702', '220702', '宁江区', '2207', 3); -INSERT INTO `dic_city` VALUES ('220721', '220721', '前郭尔罗斯蒙古族自治县', '2207', 3); -INSERT INTO `dic_city` VALUES ('220722', '220722', '长岭县', '2207', 3); -INSERT INTO `dic_city` VALUES ('220723', '220723', '乾安县', '2207', 3); -INSERT INTO `dic_city` VALUES ('220771', '220771', '吉林松原经济开发区', '2207', 3); -INSERT INTO `dic_city` VALUES ('220781', '220781', '扶余市', '2207', 3); -INSERT INTO `dic_city` VALUES ('2208', '2208', '白城市', '22', 2); -INSERT INTO `dic_city` VALUES ('220802', '220802', '洮北区', '2208', 3); -INSERT INTO `dic_city` VALUES ('220821', '220821', '镇赉县', '2208', 3); -INSERT INTO `dic_city` VALUES ('220822', '220822', '通榆县', '2208', 3); -INSERT INTO `dic_city` VALUES ('220871', '220871', '吉林白城经济开发区', '2208', 3); -INSERT INTO `dic_city` VALUES ('220881', '220881', '洮南市', '2208', 3); -INSERT INTO `dic_city` VALUES ('220882', '220882', '大安市', '2208', 3); -INSERT INTO `dic_city` VALUES ('2224', '2224', '延边朝鲜族自治州', '22', 2); -INSERT INTO `dic_city` VALUES ('222401', '222401', '延吉市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222402', '222402', '图们市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222403', '222403', '敦化市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222404', '222404', '珲春市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222405', '222405', '龙井市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222406', '222406', '和龙市', '2224', 3); -INSERT INTO `dic_city` VALUES ('222424', '222424', '汪清县', '2224', 3); -INSERT INTO `dic_city` VALUES ('222426', '222426', '安图县', '2224', 3); -INSERT INTO `dic_city` VALUES ('23', '23', '黑龙江省', NULL, 1); -INSERT INTO `dic_city` VALUES ('2301', '2301', '哈尔滨市', '23', 2); -INSERT INTO `dic_city` VALUES ('230102', '230102', '道里区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230103', '230103', '南岗区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230104', '230104', '道外区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230108', '230108', '平房区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230109', '230109', '松北区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230110', '230110', '香坊区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230111', '230111', '呼兰区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230112', '230112', '阿城区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230113', '230113', '双城区', '2301', 3); -INSERT INTO `dic_city` VALUES ('230123', '230123', '依兰县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230124', '230124', '方正县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230125', '230125', '宾县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230126', '230126', '巴彦县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230127', '230127', '木兰县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230128', '230128', '通河县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230129', '230129', '延寿县', '2301', 3); -INSERT INTO `dic_city` VALUES ('230183', '230183', '尚志市', '2301', 3); -INSERT INTO `dic_city` VALUES ('230184', '230184', '五常市', '2301', 3); -INSERT INTO `dic_city` VALUES ('2302', '2302', '齐齐哈尔市', '23', 2); -INSERT INTO `dic_city` VALUES ('230202', '230202', '龙沙区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230203', '230203', '建华区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230204', '230204', '铁锋区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230205', '230205', '昂昂溪区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230206', '230206', '富拉尔基区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230207', '230207', '碾子山区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230208', '230208', '梅里斯达斡尔族区', '2302', 3); -INSERT INTO `dic_city` VALUES ('230221', '230221', '龙江县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230223', '230223', '依安县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230224', '230224', '泰来县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230225', '230225', '甘南县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230227', '230227', '富裕县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230229', '230229', '克山县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230230', '230230', '克东县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230231', '230231', '拜泉县', '2302', 3); -INSERT INTO `dic_city` VALUES ('230281', '230281', '讷河市', '2302', 3); -INSERT INTO `dic_city` VALUES ('2303', '2303', '鸡西市', '23', 2); -INSERT INTO `dic_city` VALUES ('230302', '230302', '鸡冠区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230303', '230303', '恒山区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230304', '230304', '滴道区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230305', '230305', '梨树区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230306', '230306', '城子河区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230307', '230307', '麻山区', '2303', 3); -INSERT INTO `dic_city` VALUES ('230321', '230321', '鸡东县', '2303', 3); -INSERT INTO `dic_city` VALUES ('230381', '230381', '虎林市', '2303', 3); -INSERT INTO `dic_city` VALUES ('230382', '230382', '密山市', '2303', 3); -INSERT INTO `dic_city` VALUES ('2304', '2304', '鹤岗市', '23', 2); -INSERT INTO `dic_city` VALUES ('230402', '230402', '向阳区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230403', '230403', '工农区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230404', '230404', '南山区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230405', '230405', '兴安区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230406', '230406', '东山区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230407', '230407', '兴山区', '2304', 3); -INSERT INTO `dic_city` VALUES ('230421', '230421', '萝北县', '2304', 3); -INSERT INTO `dic_city` VALUES ('230422', '230422', '绥滨县', '2304', 3); -INSERT INTO `dic_city` VALUES ('2305', '2305', '双鸭山市', '23', 2); -INSERT INTO `dic_city` VALUES ('230502', '230502', '尖山区', '2305', 3); -INSERT INTO `dic_city` VALUES ('230503', '230503', '岭东区', '2305', 3); -INSERT INTO `dic_city` VALUES ('230505', '230505', '四方台区', '2305', 3); -INSERT INTO `dic_city` VALUES ('230506', '230506', '宝山区', '2305', 3); -INSERT INTO `dic_city` VALUES ('230521', '230521', '集贤县', '2305', 3); -INSERT INTO `dic_city` VALUES ('230522', '230522', '友谊县', '2305', 3); -INSERT INTO `dic_city` VALUES ('230523', '230523', '宝清县', '2305', 3); -INSERT INTO `dic_city` VALUES ('230524', '230524', '饶河县', '2305', 3); -INSERT INTO `dic_city` VALUES ('2306', '2306', '大庆市', '23', 2); -INSERT INTO `dic_city` VALUES ('230602', '230602', '萨尔图区', '2306', 3); -INSERT INTO `dic_city` VALUES ('230603', '230603', '龙凤区', '2306', 3); -INSERT INTO `dic_city` VALUES ('230604', '230604', '让胡路区', '2306', 3); -INSERT INTO `dic_city` VALUES ('230605', '230605', '红岗区', '2306', 3); -INSERT INTO `dic_city` VALUES ('230606', '230606', '大同区', '2306', 3); -INSERT INTO `dic_city` VALUES ('230621', '230621', '肇州县', '2306', 3); -INSERT INTO `dic_city` VALUES ('230622', '230622', '肇源县', '2306', 3); -INSERT INTO `dic_city` VALUES ('230623', '230623', '林甸县', '2306', 3); -INSERT INTO `dic_city` VALUES ('230624', '230624', '杜尔伯特蒙古族自治县', '2306', 3); -INSERT INTO `dic_city` VALUES ('230671', '230671', '大庆高新技术产业开发区', '2306', 3); -INSERT INTO `dic_city` VALUES ('2307', '2307', '伊春市', '23', 2); -INSERT INTO `dic_city` VALUES ('230717', '230717', '伊美区', '2307', 3); -INSERT INTO `dic_city` VALUES ('230718', '230718', '乌翠区', '2307', 3); -INSERT INTO `dic_city` VALUES ('230719', '230719', '友好区', '2307', 3); -INSERT INTO `dic_city` VALUES ('230722', '230722', '嘉荫县', '2307', 3); -INSERT INTO `dic_city` VALUES ('230723', '230723', '汤旺县', '2307', 3); -INSERT INTO `dic_city` VALUES ('230724', '230724', '丰林县', '2307', 3); -INSERT INTO `dic_city` VALUES ('230725', '230725', '大箐山县', '2307', 3); -INSERT INTO `dic_city` VALUES ('230726', '230726', '南岔县', '2307', 3); -INSERT INTO `dic_city` VALUES ('230751', '230751', '金林区', '2307', 3); -INSERT INTO `dic_city` VALUES ('230781', '230781', '铁力市', '2307', 3); -INSERT INTO `dic_city` VALUES ('2308', '2308', '佳木斯市', '23', 2); -INSERT INTO `dic_city` VALUES ('230803', '230803', '向阳区', '2308', 3); -INSERT INTO `dic_city` VALUES ('230804', '230804', '前进区', '2308', 3); -INSERT INTO `dic_city` VALUES ('230805', '230805', '东风区', '2308', 3); -INSERT INTO `dic_city` VALUES ('230811', '230811', '郊区', '2308', 3); -INSERT INTO `dic_city` VALUES ('230822', '230822', '桦南县', '2308', 3); -INSERT INTO `dic_city` VALUES ('230826', '230826', '桦川县', '2308', 3); -INSERT INTO `dic_city` VALUES ('230828', '230828', '汤原县', '2308', 3); -INSERT INTO `dic_city` VALUES ('230881', '230881', '同江市', '2308', 3); -INSERT INTO `dic_city` VALUES ('230882', '230882', '富锦市', '2308', 3); -INSERT INTO `dic_city` VALUES ('230883', '230883', '抚远市', '2308', 3); -INSERT INTO `dic_city` VALUES ('2309', '2309', '七台河市', '23', 2); -INSERT INTO `dic_city` VALUES ('230902', '230902', '新兴区', '2309', 3); -INSERT INTO `dic_city` VALUES ('230903', '230903', '桃山区', '2309', 3); -INSERT INTO `dic_city` VALUES ('230904', '230904', '茄子河区', '2309', 3); -INSERT INTO `dic_city` VALUES ('230921', '230921', '勃利县', '2309', 3); -INSERT INTO `dic_city` VALUES ('2310', '2310', '牡丹江市', '23', 2); -INSERT INTO `dic_city` VALUES ('231002', '231002', '东安区', '2310', 3); -INSERT INTO `dic_city` VALUES ('231003', '231003', '阳明区', '2310', 3); -INSERT INTO `dic_city` VALUES ('231004', '231004', '爱民区', '2310', 3); -INSERT INTO `dic_city` VALUES ('231005', '231005', '西安区', '2310', 3); -INSERT INTO `dic_city` VALUES ('231025', '231025', '林口县', '2310', 3); -INSERT INTO `dic_city` VALUES ('231071', '231071', '牡丹江经济技术开发区', '2310', 3); -INSERT INTO `dic_city` VALUES ('231081', '231081', '绥芬河市', '2310', 3); -INSERT INTO `dic_city` VALUES ('231083', '231083', '海林市', '2310', 3); -INSERT INTO `dic_city` VALUES ('231084', '231084', '宁安市', '2310', 3); -INSERT INTO `dic_city` VALUES ('231085', '231085', '穆棱市', '2310', 3); -INSERT INTO `dic_city` VALUES ('231086', '231086', '东宁市', '2310', 3); -INSERT INTO `dic_city` VALUES ('2311', '2311', '黑河市', '23', 2); -INSERT INTO `dic_city` VALUES ('231102', '231102', '爱辉区', '2311', 3); -INSERT INTO `dic_city` VALUES ('231123', '231123', '逊克县', '2311', 3); -INSERT INTO `dic_city` VALUES ('231124', '231124', '孙吴县', '2311', 3); -INSERT INTO `dic_city` VALUES ('231181', '231181', '北安市', '2311', 3); -INSERT INTO `dic_city` VALUES ('231182', '231182', '五大连池市', '2311', 3); -INSERT INTO `dic_city` VALUES ('231183', '231183', '嫩江市', '2311', 3); -INSERT INTO `dic_city` VALUES ('2312', '2312', '绥化市', '23', 2); -INSERT INTO `dic_city` VALUES ('231202', '231202', '北林区', '2312', 3); -INSERT INTO `dic_city` VALUES ('231221', '231221', '望奎县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231222', '231222', '兰西县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231223', '231223', '青冈县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231224', '231224', '庆安县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231225', '231225', '明水县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231226', '231226', '绥棱县', '2312', 3); -INSERT INTO `dic_city` VALUES ('231281', '231281', '安达市', '2312', 3); -INSERT INTO `dic_city` VALUES ('231282', '231282', '肇东市', '2312', 3); -INSERT INTO `dic_city` VALUES ('231283', '231283', '海伦市', '2312', 3); -INSERT INTO `dic_city` VALUES ('2327', '2327', '大兴安岭地区', '23', 2); -INSERT INTO `dic_city` VALUES ('232701', '232701', '漠河市', '2327', 3); -INSERT INTO `dic_city` VALUES ('232721', '232721', '呼玛县', '2327', 3); -INSERT INTO `dic_city` VALUES ('232722', '232722', '塔河县', '2327', 3); -INSERT INTO `dic_city` VALUES ('232761', '232761', '加格达奇区', '2327', 3); -INSERT INTO `dic_city` VALUES ('232762', '232762', '松岭区', '2327', 3); -INSERT INTO `dic_city` VALUES ('232763', '232763', '新林区', '2327', 3); -INSERT INTO `dic_city` VALUES ('232764', '232764', '呼中区', '2327', 3); -INSERT INTO `dic_city` VALUES ('31', '31', '上海市', NULL, 1); -INSERT INTO `dic_city` VALUES ('3101', '3101', '市辖区', '31', 2); -INSERT INTO `dic_city` VALUES ('310101', '310101', '黄浦区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310104', '310104', '徐汇区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310105', '310105', '长宁区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310106', '310106', '静安区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310107', '310107', '普陀区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310109', '310109', '虹口区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310110', '310110', '杨浦区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310112', '310112', '闵行区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310113', '310113', '宝山区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310114', '310114', '嘉定区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310115', '310115', '浦东新区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310116', '310116', '金山区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310117', '310117', '松江区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310118', '310118', '青浦区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310120', '310120', '奉贤区', '3101', 3); -INSERT INTO `dic_city` VALUES ('310151', '310151', '崇明区', '3101', 3); -INSERT INTO `dic_city` VALUES ('32', '32', '江苏省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3201', '3201', '南京市', '32', 2); -INSERT INTO `dic_city` VALUES ('320102', '320102', '玄武区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320104', '320104', '秦淮区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320105', '320105', '建邺区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320106', '320106', '鼓楼区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320111', '320111', '浦口区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320113', '320113', '栖霞区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320114', '320114', '雨花台区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320115', '320115', '江宁区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320116', '320116', '六合区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320117', '320117', '溧水区', '3201', 3); -INSERT INTO `dic_city` VALUES ('320118', '320118', '高淳区', '3201', 3); -INSERT INTO `dic_city` VALUES ('3202', '3202', '无锡市', '32', 2); -INSERT INTO `dic_city` VALUES ('320205', '320205', '锡山区', '3202', 3); -INSERT INTO `dic_city` VALUES ('320206', '320206', '惠山区', '3202', 3); -INSERT INTO `dic_city` VALUES ('320211', '320211', '滨湖区', '3202', 3); -INSERT INTO `dic_city` VALUES ('320213', '320213', '梁溪区', '3202', 3); -INSERT INTO `dic_city` VALUES ('320214', '320214', '新吴区', '3202', 3); -INSERT INTO `dic_city` VALUES ('320281', '320281', '江阴市', '3202', 3); -INSERT INTO `dic_city` VALUES ('320282', '320282', '宜兴市', '3202', 3); -INSERT INTO `dic_city` VALUES ('3203', '3203', '徐州市', '32', 2); -INSERT INTO `dic_city` VALUES ('320302', '320302', '鼓楼区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320303', '320303', '云龙区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320305', '320305', '贾汪区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320311', '320311', '泉山区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320312', '320312', '铜山区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320321', '320321', '丰县', '3203', 3); -INSERT INTO `dic_city` VALUES ('320322', '320322', '沛县', '3203', 3); -INSERT INTO `dic_city` VALUES ('320324', '320324', '睢宁县', '3203', 3); -INSERT INTO `dic_city` VALUES ('320371', '320371', '徐州经济技术开发区', '3203', 3); -INSERT INTO `dic_city` VALUES ('320381', '320381', '新沂市', '3203', 3); -INSERT INTO `dic_city` VALUES ('320382', '320382', '邳州市', '3203', 3); -INSERT INTO `dic_city` VALUES ('3204', '3204', '常州市', '32', 2); -INSERT INTO `dic_city` VALUES ('320402', '320402', '天宁区', '3204', 3); -INSERT INTO `dic_city` VALUES ('320404', '320404', '钟楼区', '3204', 3); -INSERT INTO `dic_city` VALUES ('320411', '320411', '新北区', '3204', 3); -INSERT INTO `dic_city` VALUES ('320412', '320412', '武进区', '3204', 3); -INSERT INTO `dic_city` VALUES ('320413', '320413', '金坛区', '3204', 3); -INSERT INTO `dic_city` VALUES ('320481', '320481', '溧阳市', '3204', 3); -INSERT INTO `dic_city` VALUES ('3205', '3205', '苏州市', '32', 2); -INSERT INTO `dic_city` VALUES ('320505', '320505', '虎丘区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320506', '320506', '吴中区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320507', '320507', '相城区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320508', '320508', '姑苏区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320509', '320509', '吴江区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320571', '320571', '苏州工业园区', '3205', 3); -INSERT INTO `dic_city` VALUES ('320581', '320581', '常熟市', '3205', 3); -INSERT INTO `dic_city` VALUES ('320582', '320582', '张家港市', '3205', 3); -INSERT INTO `dic_city` VALUES ('320583', '320583', '昆山市', '3205', 3); -INSERT INTO `dic_city` VALUES ('320585', '320585', '太仓市', '3205', 3); -INSERT INTO `dic_city` VALUES ('3206', '3206', '南通市', '32', 2); -INSERT INTO `dic_city` VALUES ('320602', '320602', '崇川区', '3206', 3); -INSERT INTO `dic_city` VALUES ('320611', '320611', '港闸区', '3206', 3); -INSERT INTO `dic_city` VALUES ('320612', '320612', '通州区', '3206', 3); -INSERT INTO `dic_city` VALUES ('320623', '320623', '如东县', '3206', 3); -INSERT INTO `dic_city` VALUES ('320671', '320671', '南通经济技术开发区', '3206', 3); -INSERT INTO `dic_city` VALUES ('320681', '320681', '启东市', '3206', 3); -INSERT INTO `dic_city` VALUES ('320682', '320682', '如皋市', '3206', 3); -INSERT INTO `dic_city` VALUES ('320684', '320684', '海门市', '3206', 3); -INSERT INTO `dic_city` VALUES ('320685', '320685', '海安市', '3206', 3); -INSERT INTO `dic_city` VALUES ('3207', '3207', '连云港市', '32', 2); -INSERT INTO `dic_city` VALUES ('320703', '320703', '连云区', '3207', 3); -INSERT INTO `dic_city` VALUES ('320706', '320706', '海州区', '3207', 3); -INSERT INTO `dic_city` VALUES ('320707', '320707', '赣榆区', '3207', 3); -INSERT INTO `dic_city` VALUES ('320722', '320722', '东海县', '3207', 3); -INSERT INTO `dic_city` VALUES ('320723', '320723', '灌云县', '3207', 3); -INSERT INTO `dic_city` VALUES ('320724', '320724', '灌南县', '3207', 3); -INSERT INTO `dic_city` VALUES ('320771', '320771', '连云港经济技术开发区', '3207', 3); -INSERT INTO `dic_city` VALUES ('320772', '320772', '连云港高新技术产业开发区', '3207', 3); -INSERT INTO `dic_city` VALUES ('3208', '3208', '淮安市', '32', 2); -INSERT INTO `dic_city` VALUES ('320803', '320803', '淮安区', '3208', 3); -INSERT INTO `dic_city` VALUES ('320804', '320804', '淮阴区', '3208', 3); -INSERT INTO `dic_city` VALUES ('320812', '320812', '清江浦区', '3208', 3); -INSERT INTO `dic_city` VALUES ('320813', '320813', '洪泽区', '3208', 3); -INSERT INTO `dic_city` VALUES ('320826', '320826', '涟水县', '3208', 3); -INSERT INTO `dic_city` VALUES ('320830', '320830', '盱眙县', '3208', 3); -INSERT INTO `dic_city` VALUES ('320831', '320831', '金湖县', '3208', 3); -INSERT INTO `dic_city` VALUES ('320871', '320871', '淮安经济技术开发区', '3208', 3); -INSERT INTO `dic_city` VALUES ('3209', '3209', '盐城市', '32', 2); -INSERT INTO `dic_city` VALUES ('320902', '320902', '亭湖区', '3209', 3); -INSERT INTO `dic_city` VALUES ('320903', '320903', '盐都区', '3209', 3); -INSERT INTO `dic_city` VALUES ('320904', '320904', '大丰区', '3209', 3); -INSERT INTO `dic_city` VALUES ('320921', '320921', '响水县', '3209', 3); -INSERT INTO `dic_city` VALUES ('320922', '320922', '滨海县', '3209', 3); -INSERT INTO `dic_city` VALUES ('320923', '320923', '阜宁县', '3209', 3); -INSERT INTO `dic_city` VALUES ('320924', '320924', '射阳县', '3209', 3); -INSERT INTO `dic_city` VALUES ('320925', '320925', '建湖县', '3209', 3); -INSERT INTO `dic_city` VALUES ('320971', '320971', '盐城经济技术开发区', '3209', 3); -INSERT INTO `dic_city` VALUES ('320981', '320981', '东台市', '3209', 3); -INSERT INTO `dic_city` VALUES ('3210', '3210', '扬州市', '32', 2); -INSERT INTO `dic_city` VALUES ('321002', '321002', '广陵区', '3210', 3); -INSERT INTO `dic_city` VALUES ('321003', '321003', '邗江区', '3210', 3); -INSERT INTO `dic_city` VALUES ('321012', '321012', '江都区', '3210', 3); -INSERT INTO `dic_city` VALUES ('321023', '321023', '宝应县', '3210', 3); -INSERT INTO `dic_city` VALUES ('321071', '321071', '扬州经济技术开发区', '3210', 3); -INSERT INTO `dic_city` VALUES ('321081', '321081', '仪征市', '3210', 3); -INSERT INTO `dic_city` VALUES ('321084', '321084', '高邮市', '3210', 3); -INSERT INTO `dic_city` VALUES ('3211', '3211', '镇江市', '32', 2); -INSERT INTO `dic_city` VALUES ('321102', '321102', '京口区', '3211', 3); -INSERT INTO `dic_city` VALUES ('321111', '321111', '润州区', '3211', 3); -INSERT INTO `dic_city` VALUES ('321112', '321112', '丹徒区', '3211', 3); -INSERT INTO `dic_city` VALUES ('321171', '321171', '镇江新区', '3211', 3); -INSERT INTO `dic_city` VALUES ('321181', '321181', '丹阳市', '3211', 3); -INSERT INTO `dic_city` VALUES ('321182', '321182', '扬中市', '3211', 3); -INSERT INTO `dic_city` VALUES ('321183', '321183', '句容市', '3211', 3); -INSERT INTO `dic_city` VALUES ('3212', '3212', '泰州市', '32', 2); -INSERT INTO `dic_city` VALUES ('321202', '321202', '海陵区', '3212', 3); -INSERT INTO `dic_city` VALUES ('321203', '321203', '高港区', '3212', 3); -INSERT INTO `dic_city` VALUES ('321204', '321204', '姜堰区', '3212', 3); -INSERT INTO `dic_city` VALUES ('321271', '321271', '泰州医药高新技术产业开发区', '3212', 3); -INSERT INTO `dic_city` VALUES ('321281', '321281', '兴化市', '3212', 3); -INSERT INTO `dic_city` VALUES ('321282', '321282', '靖江市', '3212', 3); -INSERT INTO `dic_city` VALUES ('321283', '321283', '泰兴市', '3212', 3); -INSERT INTO `dic_city` VALUES ('3213', '3213', '宿迁市', '32', 2); -INSERT INTO `dic_city` VALUES ('321302', '321302', '宿城区', '3213', 3); -INSERT INTO `dic_city` VALUES ('321311', '321311', '宿豫区', '3213', 3); -INSERT INTO `dic_city` VALUES ('321322', '321322', '沭阳县', '3213', 3); -INSERT INTO `dic_city` VALUES ('321323', '321323', '泗阳县', '3213', 3); -INSERT INTO `dic_city` VALUES ('321324', '321324', '泗洪县', '3213', 3); -INSERT INTO `dic_city` VALUES ('321371', '321371', '宿迁经济技术开发区', '3213', 3); -INSERT INTO `dic_city` VALUES ('33', '33', '浙江省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3301', '3301', '杭州市', '33', 2); -INSERT INTO `dic_city` VALUES ('330102', '330102', '上城区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330103', '330103', '下城区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330104', '330104', '江干区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330105', '330105', '拱墅区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330106', '330106', '西湖区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330108', '330108', '滨江区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330109', '330109', '萧山区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330110', '330110', '余杭区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330111', '330111', '富阳区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330112', '330112', '临安区', '3301', 3); -INSERT INTO `dic_city` VALUES ('330122', '330122', '桐庐县', '3301', 3); -INSERT INTO `dic_city` VALUES ('330127', '330127', '淳安县', '3301', 3); -INSERT INTO `dic_city` VALUES ('330182', '330182', '建德市', '3301', 3); -INSERT INTO `dic_city` VALUES ('3302', '3302', '宁波市', '33', 2); -INSERT INTO `dic_city` VALUES ('330203', '330203', '海曙区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330205', '330205', '江北区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330206', '330206', '北仑区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330211', '330211', '镇海区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330212', '330212', '鄞州区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330213', '330213', '奉化区', '3302', 3); -INSERT INTO `dic_city` VALUES ('330225', '330225', '象山县', '3302', 3); -INSERT INTO `dic_city` VALUES ('330226', '330226', '宁海县', '3302', 3); -INSERT INTO `dic_city` VALUES ('330281', '330281', '余姚市', '3302', 3); -INSERT INTO `dic_city` VALUES ('330282', '330282', '慈溪市', '3302', 3); -INSERT INTO `dic_city` VALUES ('3303', '3303', '温州市', '33', 2); -INSERT INTO `dic_city` VALUES ('330302', '330302', '鹿城区', '3303', 3); -INSERT INTO `dic_city` VALUES ('330303', '330303', '龙湾区', '3303', 3); -INSERT INTO `dic_city` VALUES ('330304', '330304', '瓯海区', '3303', 3); -INSERT INTO `dic_city` VALUES ('330305', '330305', '洞头区', '3303', 3); -INSERT INTO `dic_city` VALUES ('330324', '330324', '永嘉县', '3303', 3); -INSERT INTO `dic_city` VALUES ('330326', '330326', '平阳县', '3303', 3); -INSERT INTO `dic_city` VALUES ('330327', '330327', '苍南县', '3303', 3); -INSERT INTO `dic_city` VALUES ('330328', '330328', '文成县', '3303', 3); -INSERT INTO `dic_city` VALUES ('330329', '330329', '泰顺县', '3303', 3); -INSERT INTO `dic_city` VALUES ('330371', '330371', '温州经济技术开发区', '3303', 3); -INSERT INTO `dic_city` VALUES ('330381', '330381', '瑞安市', '3303', 3); -INSERT INTO `dic_city` VALUES ('330382', '330382', '乐清市', '3303', 3); -INSERT INTO `dic_city` VALUES ('330383', '330383', '龙港市', '3303', 3); -INSERT INTO `dic_city` VALUES ('3304', '3304', '嘉兴市', '33', 2); -INSERT INTO `dic_city` VALUES ('330402', '330402', '南湖区', '3304', 3); -INSERT INTO `dic_city` VALUES ('330411', '330411', '秀洲区', '3304', 3); -INSERT INTO `dic_city` VALUES ('330421', '330421', '嘉善县', '3304', 3); -INSERT INTO `dic_city` VALUES ('330424', '330424', '海盐县', '3304', 3); -INSERT INTO `dic_city` VALUES ('330481', '330481', '海宁市', '3304', 3); -INSERT INTO `dic_city` VALUES ('330482', '330482', '平湖市', '3304', 3); -INSERT INTO `dic_city` VALUES ('330483', '330483', '桐乡市', '3304', 3); -INSERT INTO `dic_city` VALUES ('3305', '3305', '湖州市', '33', 2); -INSERT INTO `dic_city` VALUES ('330502', '330502', '吴兴区', '3305', 3); -INSERT INTO `dic_city` VALUES ('330503', '330503', '南浔区', '3305', 3); -INSERT INTO `dic_city` VALUES ('330521', '330521', '德清县', '3305', 3); -INSERT INTO `dic_city` VALUES ('330522', '330522', '长兴县', '3305', 3); -INSERT INTO `dic_city` VALUES ('330523', '330523', '安吉县', '3305', 3); -INSERT INTO `dic_city` VALUES ('3306', '3306', '绍兴市', '33', 2); -INSERT INTO `dic_city` VALUES ('330602', '330602', '越城区', '3306', 3); -INSERT INTO `dic_city` VALUES ('330603', '330603', '柯桥区', '3306', 3); -INSERT INTO `dic_city` VALUES ('330604', '330604', '上虞区', '3306', 3); -INSERT INTO `dic_city` VALUES ('330624', '330624', '新昌县', '3306', 3); -INSERT INTO `dic_city` VALUES ('330681', '330681', '诸暨市', '3306', 3); -INSERT INTO `dic_city` VALUES ('330683', '330683', '嵊州市', '3306', 3); -INSERT INTO `dic_city` VALUES ('3307', '3307', '金华市', '33', 2); -INSERT INTO `dic_city` VALUES ('330702', '330702', '婺城区', '3307', 3); -INSERT INTO `dic_city` VALUES ('330703', '330703', '金东区', '3307', 3); -INSERT INTO `dic_city` VALUES ('330723', '330723', '武义县', '3307', 3); -INSERT INTO `dic_city` VALUES ('330726', '330726', '浦江县', '3307', 3); -INSERT INTO `dic_city` VALUES ('330727', '330727', '磐安县', '3307', 3); -INSERT INTO `dic_city` VALUES ('330781', '330781', '兰溪市', '3307', 3); -INSERT INTO `dic_city` VALUES ('330782', '330782', '义乌市', '3307', 3); -INSERT INTO `dic_city` VALUES ('330783', '330783', '东阳市', '3307', 3); -INSERT INTO `dic_city` VALUES ('330784', '330784', '永康市', '3307', 3); -INSERT INTO `dic_city` VALUES ('3308', '3308', '衢州市', '33', 2); -INSERT INTO `dic_city` VALUES ('330802', '330802', '柯城区', '3308', 3); -INSERT INTO `dic_city` VALUES ('330803', '330803', '衢江区', '3308', 3); -INSERT INTO `dic_city` VALUES ('330822', '330822', '常山县', '3308', 3); -INSERT INTO `dic_city` VALUES ('330824', '330824', '开化县', '3308', 3); -INSERT INTO `dic_city` VALUES ('330825', '330825', '龙游县', '3308', 3); -INSERT INTO `dic_city` VALUES ('330881', '330881', '江山市', '3308', 3); -INSERT INTO `dic_city` VALUES ('3309', '3309', '舟山市', '33', 2); -INSERT INTO `dic_city` VALUES ('330902', '330902', '定海区', '3309', 3); -INSERT INTO `dic_city` VALUES ('330903', '330903', '普陀区', '3309', 3); -INSERT INTO `dic_city` VALUES ('330921', '330921', '岱山县', '3309', 3); -INSERT INTO `dic_city` VALUES ('330922', '330922', '嵊泗县', '3309', 3); -INSERT INTO `dic_city` VALUES ('3310', '3310', '台州市', '33', 2); -INSERT INTO `dic_city` VALUES ('331002', '331002', '椒江区', '3310', 3); -INSERT INTO `dic_city` VALUES ('331003', '331003', '黄岩区', '3310', 3); -INSERT INTO `dic_city` VALUES ('331004', '331004', '路桥区', '3310', 3); -INSERT INTO `dic_city` VALUES ('331022', '331022', '三门县', '3310', 3); -INSERT INTO `dic_city` VALUES ('331023', '331023', '天台县', '3310', 3); -INSERT INTO `dic_city` VALUES ('331024', '331024', '仙居县', '3310', 3); -INSERT INTO `dic_city` VALUES ('331081', '331081', '温岭市', '3310', 3); -INSERT INTO `dic_city` VALUES ('331082', '331082', '临海市', '3310', 3); -INSERT INTO `dic_city` VALUES ('331083', '331083', '玉环市', '3310', 3); -INSERT INTO `dic_city` VALUES ('3311', '3311', '丽水市', '33', 2); -INSERT INTO `dic_city` VALUES ('331102', '331102', '莲都区', '3311', 3); -INSERT INTO `dic_city` VALUES ('331121', '331121', '青田县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331122', '331122', '缙云县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331123', '331123', '遂昌县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331124', '331124', '松阳县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331125', '331125', '云和县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331126', '331126', '庆元县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331127', '331127', '景宁畲族自治县', '3311', 3); -INSERT INTO `dic_city` VALUES ('331181', '331181', '龙泉市', '3311', 3); -INSERT INTO `dic_city` VALUES ('34', '34', '安徽省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3401', '3401', '合肥市', '34', 2); -INSERT INTO `dic_city` VALUES ('340102', '340102', '瑶海区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340103', '340103', '庐阳区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340104', '340104', '蜀山区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340111', '340111', '包河区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340121', '340121', '长丰县', '3401', 3); -INSERT INTO `dic_city` VALUES ('340122', '340122', '肥东县', '3401', 3); -INSERT INTO `dic_city` VALUES ('340123', '340123', '肥西县', '3401', 3); -INSERT INTO `dic_city` VALUES ('340124', '340124', '庐江县', '3401', 3); -INSERT INTO `dic_city` VALUES ('340171', '340171', '合肥高新技术产业开发区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340172', '340172', '合肥经济技术开发区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340173', '340173', '合肥新站高新技术产业开发区', '3401', 3); -INSERT INTO `dic_city` VALUES ('340181', '340181', '巢湖市', '3401', 3); -INSERT INTO `dic_city` VALUES ('3402', '3402', '芜湖市', '34', 2); -INSERT INTO `dic_city` VALUES ('340202', '340202', '镜湖区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340203', '340203', '弋江区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340207', '340207', '鸠江区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340208', '340208', '三山区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340221', '340221', '芜湖县', '3402', 3); -INSERT INTO `dic_city` VALUES ('340222', '340222', '繁昌县', '3402', 3); -INSERT INTO `dic_city` VALUES ('340223', '340223', '南陵县', '3402', 3); -INSERT INTO `dic_city` VALUES ('340271', '340271', '芜湖经济技术开发区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340272', '340272', '安徽芜湖长江大桥经济开发区', '3402', 3); -INSERT INTO `dic_city` VALUES ('340281', '340281', '无为市', '3402', 3); -INSERT INTO `dic_city` VALUES ('3403', '3403', '蚌埠市', '34', 2); -INSERT INTO `dic_city` VALUES ('340302', '340302', '龙子湖区', '3403', 3); -INSERT INTO `dic_city` VALUES ('340303', '340303', '蚌山区', '3403', 3); -INSERT INTO `dic_city` VALUES ('340304', '340304', '禹会区', '3403', 3); -INSERT INTO `dic_city` VALUES ('340311', '340311', '淮上区', '3403', 3); -INSERT INTO `dic_city` VALUES ('340321', '340321', '怀远县', '3403', 3); -INSERT INTO `dic_city` VALUES ('340322', '340322', '五河县', '3403', 3); -INSERT INTO `dic_city` VALUES ('340323', '340323', '固镇县', '3403', 3); -INSERT INTO `dic_city` VALUES ('340371', '340371', '蚌埠市高新技术开发区', '3403', 3); -INSERT INTO `dic_city` VALUES ('340372', '340372', '蚌埠市经济开发区', '3403', 3); -INSERT INTO `dic_city` VALUES ('3404', '3404', '淮南市', '34', 2); -INSERT INTO `dic_city` VALUES ('340402', '340402', '大通区', '3404', 3); -INSERT INTO `dic_city` VALUES ('340403', '340403', '田家庵区', '3404', 3); -INSERT INTO `dic_city` VALUES ('340404', '340404', '谢家集区', '3404', 3); -INSERT INTO `dic_city` VALUES ('340405', '340405', '八公山区', '3404', 3); -INSERT INTO `dic_city` VALUES ('340406', '340406', '潘集区', '3404', 3); -INSERT INTO `dic_city` VALUES ('340421', '340421', '凤台县', '3404', 3); -INSERT INTO `dic_city` VALUES ('340422', '340422', '寿县', '3404', 3); -INSERT INTO `dic_city` VALUES ('3405', '3405', '马鞍山市', '34', 2); -INSERT INTO `dic_city` VALUES ('340503', '340503', '花山区', '3405', 3); -INSERT INTO `dic_city` VALUES ('340504', '340504', '雨山区', '3405', 3); -INSERT INTO `dic_city` VALUES ('340506', '340506', '博望区', '3405', 3); -INSERT INTO `dic_city` VALUES ('340521', '340521', '当涂县', '3405', 3); -INSERT INTO `dic_city` VALUES ('340522', '340522', '含山县', '3405', 3); -INSERT INTO `dic_city` VALUES ('340523', '340523', '和县', '3405', 3); -INSERT INTO `dic_city` VALUES ('3406', '3406', '淮北市', '34', 2); -INSERT INTO `dic_city` VALUES ('340602', '340602', '杜集区', '3406', 3); -INSERT INTO `dic_city` VALUES ('340603', '340603', '相山区', '3406', 3); -INSERT INTO `dic_city` VALUES ('340604', '340604', '烈山区', '3406', 3); -INSERT INTO `dic_city` VALUES ('340621', '340621', '濉溪县', '3406', 3); -INSERT INTO `dic_city` VALUES ('3407', '3407', '铜陵市', '34', 2); -INSERT INTO `dic_city` VALUES ('340705', '340705', '铜官区', '3407', 3); -INSERT INTO `dic_city` VALUES ('340706', '340706', '义安区', '3407', 3); -INSERT INTO `dic_city` VALUES ('340711', '340711', '郊区', '3407', 3); -INSERT INTO `dic_city` VALUES ('340722', '340722', '枞阳县', '3407', 3); -INSERT INTO `dic_city` VALUES ('3408', '3408', '安庆市', '34', 2); -INSERT INTO `dic_city` VALUES ('340802', '340802', '迎江区', '3408', 3); -INSERT INTO `dic_city` VALUES ('340803', '340803', '大观区', '3408', 3); -INSERT INTO `dic_city` VALUES ('340811', '340811', '宜秀区', '3408', 3); -INSERT INTO `dic_city` VALUES ('340822', '340822', '怀宁县', '3408', 3); -INSERT INTO `dic_city` VALUES ('340825', '340825', '太湖县', '3408', 3); -INSERT INTO `dic_city` VALUES ('340826', '340826', '宿松县', '3408', 3); -INSERT INTO `dic_city` VALUES ('340827', '340827', '望江县', '3408', 3); -INSERT INTO `dic_city` VALUES ('340828', '340828', '岳西县', '3408', 3); -INSERT INTO `dic_city` VALUES ('340871', '340871', '安徽安庆经济开发区', '3408', 3); -INSERT INTO `dic_city` VALUES ('340881', '340881', '桐城市', '3408', 3); -INSERT INTO `dic_city` VALUES ('340882', '340882', '潜山市', '3408', 3); -INSERT INTO `dic_city` VALUES ('3410', '3410', '黄山市', '34', 2); -INSERT INTO `dic_city` VALUES ('341002', '341002', '屯溪区', '3410', 3); -INSERT INTO `dic_city` VALUES ('341003', '341003', '黄山区', '3410', 3); -INSERT INTO `dic_city` VALUES ('341004', '341004', '徽州区', '3410', 3); -INSERT INTO `dic_city` VALUES ('341021', '341021', '歙县', '3410', 3); -INSERT INTO `dic_city` VALUES ('341022', '341022', '休宁县', '3410', 3); -INSERT INTO `dic_city` VALUES ('341023', '341023', '黟县', '3410', 3); -INSERT INTO `dic_city` VALUES ('341024', '341024', '祁门县', '3410', 3); -INSERT INTO `dic_city` VALUES ('3411', '3411', '滁州市', '34', 2); -INSERT INTO `dic_city` VALUES ('341102', '341102', '琅琊区', '3411', 3); -INSERT INTO `dic_city` VALUES ('341103', '341103', '南谯区', '3411', 3); -INSERT INTO `dic_city` VALUES ('341122', '341122', '来安县', '3411', 3); -INSERT INTO `dic_city` VALUES ('341124', '341124', '全椒县', '3411', 3); -INSERT INTO `dic_city` VALUES ('341125', '341125', '定远县', '3411', 3); -INSERT INTO `dic_city` VALUES ('341126', '341126', '凤阳县', '3411', 3); -INSERT INTO `dic_city` VALUES ('341171', '341171', '苏滁现代产业园', '3411', 3); -INSERT INTO `dic_city` VALUES ('341172', '341172', '滁州经济技术开发区', '3411', 3); -INSERT INTO `dic_city` VALUES ('341181', '341181', '天长市', '3411', 3); -INSERT INTO `dic_city` VALUES ('341182', '341182', '明光市', '3411', 3); -INSERT INTO `dic_city` VALUES ('3412', '3412', '阜阳市', '34', 2); -INSERT INTO `dic_city` VALUES ('341202', '341202', '颍州区', '3412', 3); -INSERT INTO `dic_city` VALUES ('341203', '341203', '颍东区', '3412', 3); -INSERT INTO `dic_city` VALUES ('341204', '341204', '颍泉区', '3412', 3); -INSERT INTO `dic_city` VALUES ('341221', '341221', '临泉县', '3412', 3); -INSERT INTO `dic_city` VALUES ('341222', '341222', '太和县', '3412', 3); -INSERT INTO `dic_city` VALUES ('341225', '341225', '阜南县', '3412', 3); -INSERT INTO `dic_city` VALUES ('341226', '341226', '颍上县', '3412', 3); -INSERT INTO `dic_city` VALUES ('341271', '341271', '阜阳合肥现代产业园区', '3412', 3); -INSERT INTO `dic_city` VALUES ('341272', '341272', '阜阳经济技术开发区', '3412', 3); -INSERT INTO `dic_city` VALUES ('341282', '341282', '界首市', '3412', 3); -INSERT INTO `dic_city` VALUES ('3413', '3413', '宿州市', '34', 2); -INSERT INTO `dic_city` VALUES ('341302', '341302', '埇桥区', '3413', 3); -INSERT INTO `dic_city` VALUES ('341321', '341321', '砀山县', '3413', 3); -INSERT INTO `dic_city` VALUES ('341322', '341322', '萧县', '3413', 3); -INSERT INTO `dic_city` VALUES ('341323', '341323', '灵璧县', '3413', 3); -INSERT INTO `dic_city` VALUES ('341324', '341324', '泗县', '3413', 3); -INSERT INTO `dic_city` VALUES ('341371', '341371', '宿州马鞍山现代产业园区', '3413', 3); -INSERT INTO `dic_city` VALUES ('341372', '341372', '宿州经济技术开发区', '3413', 3); -INSERT INTO `dic_city` VALUES ('3415', '3415', '六安市', '34', 2); -INSERT INTO `dic_city` VALUES ('341502', '341502', '金安区', '3415', 3); -INSERT INTO `dic_city` VALUES ('341503', '341503', '裕安区', '3415', 3); -INSERT INTO `dic_city` VALUES ('341504', '341504', '叶集区', '3415', 3); -INSERT INTO `dic_city` VALUES ('341522', '341522', '霍邱县', '3415', 3); -INSERT INTO `dic_city` VALUES ('341523', '341523', '舒城县', '3415', 3); -INSERT INTO `dic_city` VALUES ('341524', '341524', '金寨县', '3415', 3); -INSERT INTO `dic_city` VALUES ('341525', '341525', '霍山县', '3415', 3); -INSERT INTO `dic_city` VALUES ('3416', '3416', '亳州市', '34', 2); -INSERT INTO `dic_city` VALUES ('341602', '341602', '谯城区', '3416', 3); -INSERT INTO `dic_city` VALUES ('341621', '341621', '涡阳县', '3416', 3); -INSERT INTO `dic_city` VALUES ('341622', '341622', '蒙城县', '3416', 3); -INSERT INTO `dic_city` VALUES ('341623', '341623', '利辛县', '3416', 3); -INSERT INTO `dic_city` VALUES ('3417', '3417', '池州市', '34', 2); -INSERT INTO `dic_city` VALUES ('341702', '341702', '贵池区', '3417', 3); -INSERT INTO `dic_city` VALUES ('341721', '341721', '东至县', '3417', 3); -INSERT INTO `dic_city` VALUES ('341722', '341722', '石台县', '3417', 3); -INSERT INTO `dic_city` VALUES ('341723', '341723', '青阳县', '3417', 3); -INSERT INTO `dic_city` VALUES ('3418', '3418', '宣城市', '34', 2); -INSERT INTO `dic_city` VALUES ('341802', '341802', '宣州区', '3418', 3); -INSERT INTO `dic_city` VALUES ('341821', '341821', '郎溪县', '3418', 3); -INSERT INTO `dic_city` VALUES ('341823', '341823', '泾县', '3418', 3); -INSERT INTO `dic_city` VALUES ('341824', '341824', '绩溪县', '3418', 3); -INSERT INTO `dic_city` VALUES ('341825', '341825', '旌德县', '3418', 3); -INSERT INTO `dic_city` VALUES ('341871', '341871', '宣城市经济开发区', '3418', 3); -INSERT INTO `dic_city` VALUES ('341881', '341881', '宁国市', '3418', 3); -INSERT INTO `dic_city` VALUES ('341882', '341882', '广德市', '3418', 3); -INSERT INTO `dic_city` VALUES ('35', '35', '福建省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3501', '3501', '福州市', '35', 2); -INSERT INTO `dic_city` VALUES ('350102', '350102', '鼓楼区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350103', '350103', '台江区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350104', '350104', '仓山区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350105', '350105', '马尾区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350111', '350111', '晋安区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350112', '350112', '长乐区', '3501', 3); -INSERT INTO `dic_city` VALUES ('350121', '350121', '闽侯县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350122', '350122', '连江县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350123', '350123', '罗源县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350124', '350124', '闽清县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350125', '350125', '永泰县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350128', '350128', '平潭县', '3501', 3); -INSERT INTO `dic_city` VALUES ('350181', '350181', '福清市', '3501', 3); -INSERT INTO `dic_city` VALUES ('3502', '3502', '厦门市', '35', 2); -INSERT INTO `dic_city` VALUES ('350203', '350203', '思明区', '3502', 3); -INSERT INTO `dic_city` VALUES ('350205', '350205', '海沧区', '3502', 3); -INSERT INTO `dic_city` VALUES ('350206', '350206', '湖里区', '3502', 3); -INSERT INTO `dic_city` VALUES ('350211', '350211', '集美区', '3502', 3); -INSERT INTO `dic_city` VALUES ('350212', '350212', '同安区', '3502', 3); -INSERT INTO `dic_city` VALUES ('350213', '350213', '翔安区', '3502', 3); -INSERT INTO `dic_city` VALUES ('3503', '3503', '莆田市', '35', 2); -INSERT INTO `dic_city` VALUES ('350302', '350302', '城厢区', '3503', 3); -INSERT INTO `dic_city` VALUES ('350303', '350303', '涵江区', '3503', 3); -INSERT INTO `dic_city` VALUES ('350304', '350304', '荔城区', '3503', 3); -INSERT INTO `dic_city` VALUES ('350305', '350305', '秀屿区', '3503', 3); -INSERT INTO `dic_city` VALUES ('350322', '350322', '仙游县', '3503', 3); -INSERT INTO `dic_city` VALUES ('3504', '3504', '三明市', '35', 2); -INSERT INTO `dic_city` VALUES ('350402', '350402', '梅列区', '3504', 3); -INSERT INTO `dic_city` VALUES ('350403', '350403', '三元区', '3504', 3); -INSERT INTO `dic_city` VALUES ('350421', '350421', '明溪县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350423', '350423', '清流县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350424', '350424', '宁化县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350425', '350425', '大田县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350426', '350426', '尤溪县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350427', '350427', '沙县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350428', '350428', '将乐县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350429', '350429', '泰宁县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350430', '350430', '建宁县', '3504', 3); -INSERT INTO `dic_city` VALUES ('350481', '350481', '永安市', '3504', 3); -INSERT INTO `dic_city` VALUES ('3505', '3505', '泉州市', '35', 2); -INSERT INTO `dic_city` VALUES ('350502', '350502', '鲤城区', '3505', 3); -INSERT INTO `dic_city` VALUES ('350503', '350503', '丰泽区', '3505', 3); -INSERT INTO `dic_city` VALUES ('350504', '350504', '洛江区', '3505', 3); -INSERT INTO `dic_city` VALUES ('350505', '350505', '泉港区', '3505', 3); -INSERT INTO `dic_city` VALUES ('350521', '350521', '惠安县', '3505', 3); -INSERT INTO `dic_city` VALUES ('350524', '350524', '安溪县', '3505', 3); -INSERT INTO `dic_city` VALUES ('350525', '350525', '永春县', '3505', 3); -INSERT INTO `dic_city` VALUES ('350526', '350526', '德化县', '3505', 3); -INSERT INTO `dic_city` VALUES ('350527', '350527', '金门县', '3505', 3); -INSERT INTO `dic_city` VALUES ('350581', '350581', '石狮市', '3505', 3); -INSERT INTO `dic_city` VALUES ('350582', '350582', '晋江市', '3505', 3); -INSERT INTO `dic_city` VALUES ('350583', '350583', '南安市', '3505', 3); -INSERT INTO `dic_city` VALUES ('3506', '3506', '漳州市', '35', 2); -INSERT INTO `dic_city` VALUES ('350602', '350602', '芗城区', '3506', 3); -INSERT INTO `dic_city` VALUES ('350603', '350603', '龙文区', '3506', 3); -INSERT INTO `dic_city` VALUES ('350622', '350622', '云霄县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350623', '350623', '漳浦县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350624', '350624', '诏安县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350625', '350625', '长泰县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350626', '350626', '东山县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350627', '350627', '南靖县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350628', '350628', '平和县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350629', '350629', '华安县', '3506', 3); -INSERT INTO `dic_city` VALUES ('350681', '350681', '龙海市', '3506', 3); -INSERT INTO `dic_city` VALUES ('3507', '3507', '南平市', '35', 2); -INSERT INTO `dic_city` VALUES ('350702', '350702', '延平区', '3507', 3); -INSERT INTO `dic_city` VALUES ('350703', '350703', '建阳区', '3507', 3); -INSERT INTO `dic_city` VALUES ('350721', '350721', '顺昌县', '3507', 3); -INSERT INTO `dic_city` VALUES ('350722', '350722', '浦城县', '3507', 3); -INSERT INTO `dic_city` VALUES ('350723', '350723', '光泽县', '3507', 3); -INSERT INTO `dic_city` VALUES ('350724', '350724', '松溪县', '3507', 3); -INSERT INTO `dic_city` VALUES ('350725', '350725', '政和县', '3507', 3); -INSERT INTO `dic_city` VALUES ('350781', '350781', '邵武市', '3507', 3); -INSERT INTO `dic_city` VALUES ('350782', '350782', '武夷山市', '3507', 3); -INSERT INTO `dic_city` VALUES ('350783', '350783', '建瓯市', '3507', 3); -INSERT INTO `dic_city` VALUES ('3508', '3508', '龙岩市', '35', 2); -INSERT INTO `dic_city` VALUES ('350802', '350802', '新罗区', '3508', 3); -INSERT INTO `dic_city` VALUES ('350803', '350803', '永定区', '3508', 3); -INSERT INTO `dic_city` VALUES ('350821', '350821', '长汀县', '3508', 3); -INSERT INTO `dic_city` VALUES ('350823', '350823', '上杭县', '3508', 3); -INSERT INTO `dic_city` VALUES ('350824', '350824', '武平县', '3508', 3); -INSERT INTO `dic_city` VALUES ('350825', '350825', '连城县', '3508', 3); -INSERT INTO `dic_city` VALUES ('350881', '350881', '漳平市', '3508', 3); -INSERT INTO `dic_city` VALUES ('3509', '3509', '宁德市', '35', 2); -INSERT INTO `dic_city` VALUES ('350902', '350902', '蕉城区', '3509', 3); -INSERT INTO `dic_city` VALUES ('350921', '350921', '霞浦县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350922', '350922', '古田县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350923', '350923', '屏南县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350924', '350924', '寿宁县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350925', '350925', '周宁县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350926', '350926', '柘荣县', '3509', 3); -INSERT INTO `dic_city` VALUES ('350981', '350981', '福安市', '3509', 3); -INSERT INTO `dic_city` VALUES ('350982', '350982', '福鼎市', '3509', 3); -INSERT INTO `dic_city` VALUES ('36', '36', '江西省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3601', '3601', '南昌市', '36', 2); -INSERT INTO `dic_city` VALUES ('360102', '360102', '东湖区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360103', '360103', '西湖区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360104', '360104', '青云谱区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360111', '360111', '青山湖区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360112', '360112', '新建区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360113', '360113', '红谷滩区', '3601', 3); -INSERT INTO `dic_city` VALUES ('360121', '360121', '南昌县', '3601', 3); -INSERT INTO `dic_city` VALUES ('360123', '360123', '安义县', '3601', 3); -INSERT INTO `dic_city` VALUES ('360124', '360124', '进贤县', '3601', 3); -INSERT INTO `dic_city` VALUES ('3602', '3602', '景德镇市', '36', 2); -INSERT INTO `dic_city` VALUES ('360202', '360202', '昌江区', '3602', 3); -INSERT INTO `dic_city` VALUES ('360203', '360203', '珠山区', '3602', 3); -INSERT INTO `dic_city` VALUES ('360222', '360222', '浮梁县', '3602', 3); -INSERT INTO `dic_city` VALUES ('360281', '360281', '乐平市', '3602', 3); -INSERT INTO `dic_city` VALUES ('3603', '3603', '萍乡市', '36', 2); -INSERT INTO `dic_city` VALUES ('360302', '360302', '安源区', '3603', 3); -INSERT INTO `dic_city` VALUES ('360313', '360313', '湘东区', '3603', 3); -INSERT INTO `dic_city` VALUES ('360321', '360321', '莲花县', '3603', 3); -INSERT INTO `dic_city` VALUES ('360322', '360322', '上栗县', '3603', 3); -INSERT INTO `dic_city` VALUES ('360323', '360323', '芦溪县', '3603', 3); -INSERT INTO `dic_city` VALUES ('3604', '3604', '九江市', '36', 2); -INSERT INTO `dic_city` VALUES ('360402', '360402', '濂溪区', '3604', 3); -INSERT INTO `dic_city` VALUES ('360403', '360403', '浔阳区', '3604', 3); -INSERT INTO `dic_city` VALUES ('360404', '360404', '柴桑区', '3604', 3); -INSERT INTO `dic_city` VALUES ('360423', '360423', '武宁县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360424', '360424', '修水县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360425', '360425', '永修县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360426', '360426', '德安县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360428', '360428', '都昌县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360429', '360429', '湖口县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360430', '360430', '彭泽县', '3604', 3); -INSERT INTO `dic_city` VALUES ('360481', '360481', '瑞昌市', '3604', 3); -INSERT INTO `dic_city` VALUES ('360482', '360482', '共青城市', '3604', 3); -INSERT INTO `dic_city` VALUES ('360483', '360483', '庐山市', '3604', 3); -INSERT INTO `dic_city` VALUES ('3605', '3605', '新余市', '36', 2); -INSERT INTO `dic_city` VALUES ('360502', '360502', '渝水区', '3605', 3); -INSERT INTO `dic_city` VALUES ('360521', '360521', '分宜县', '3605', 3); -INSERT INTO `dic_city` VALUES ('3606', '3606', '鹰潭市', '36', 2); -INSERT INTO `dic_city` VALUES ('360602', '360602', '月湖区', '3606', 3); -INSERT INTO `dic_city` VALUES ('360603', '360603', '余江区', '3606', 3); -INSERT INTO `dic_city` VALUES ('360681', '360681', '贵溪市', '3606', 3); -INSERT INTO `dic_city` VALUES ('3607', '3607', '赣州市', '36', 2); -INSERT INTO `dic_city` VALUES ('360702', '360702', '章贡区', '3607', 3); -INSERT INTO `dic_city` VALUES ('360703', '360703', '南康区', '3607', 3); -INSERT INTO `dic_city` VALUES ('360704', '360704', '赣县区', '3607', 3); -INSERT INTO `dic_city` VALUES ('360722', '360722', '信丰县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360723', '360723', '大余县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360724', '360724', '上犹县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360725', '360725', '崇义县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360726', '360726', '安远县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360728', '360728', '定南县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360729', '360729', '全南县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360730', '360730', '宁都县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360731', '360731', '于都县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360732', '360732', '兴国县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360733', '360733', '会昌县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360734', '360734', '寻乌县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360735', '360735', '石城县', '3607', 3); -INSERT INTO `dic_city` VALUES ('360781', '360781', '瑞金市', '3607', 3); -INSERT INTO `dic_city` VALUES ('360783', '360783', '龙南市', '3607', 3); -INSERT INTO `dic_city` VALUES ('3608', '3608', '吉安市', '36', 2); -INSERT INTO `dic_city` VALUES ('360802', '360802', '吉州区', '3608', 3); -INSERT INTO `dic_city` VALUES ('360803', '360803', '青原区', '3608', 3); -INSERT INTO `dic_city` VALUES ('360821', '360821', '吉安县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360822', '360822', '吉水县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360823', '360823', '峡江县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360824', '360824', '新干县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360825', '360825', '永丰县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360826', '360826', '泰和县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360827', '360827', '遂川县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360828', '360828', '万安县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360829', '360829', '安福县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360830', '360830', '永新县', '3608', 3); -INSERT INTO `dic_city` VALUES ('360881', '360881', '井冈山市', '3608', 3); -INSERT INTO `dic_city` VALUES ('3609', '3609', '宜春市', '36', 2); -INSERT INTO `dic_city` VALUES ('360902', '360902', '袁州区', '3609', 3); -INSERT INTO `dic_city` VALUES ('360921', '360921', '奉新县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360922', '360922', '万载县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360923', '360923', '上高县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360924', '360924', '宜丰县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360925', '360925', '靖安县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360926', '360926', '铜鼓县', '3609', 3); -INSERT INTO `dic_city` VALUES ('360981', '360981', '丰城市', '3609', 3); -INSERT INTO `dic_city` VALUES ('360982', '360982', '樟树市', '3609', 3); -INSERT INTO `dic_city` VALUES ('360983', '360983', '高安市', '3609', 3); -INSERT INTO `dic_city` VALUES ('3610', '3610', '抚州市', '36', 2); -INSERT INTO `dic_city` VALUES ('361002', '361002', '临川区', '3610', 3); -INSERT INTO `dic_city` VALUES ('361003', '361003', '东乡区', '3610', 3); -INSERT INTO `dic_city` VALUES ('361021', '361021', '南城县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361022', '361022', '黎川县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361023', '361023', '南丰县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361024', '361024', '崇仁县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361025', '361025', '乐安县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361026', '361026', '宜黄县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361027', '361027', '金溪县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361028', '361028', '资溪县', '3610', 3); -INSERT INTO `dic_city` VALUES ('361030', '361030', '广昌县', '3610', 3); -INSERT INTO `dic_city` VALUES ('3611', '3611', '上饶市', '36', 2); -INSERT INTO `dic_city` VALUES ('361102', '361102', '信州区', '3611', 3); -INSERT INTO `dic_city` VALUES ('361103', '361103', '广丰区', '3611', 3); -INSERT INTO `dic_city` VALUES ('361104', '361104', '广信区', '3611', 3); -INSERT INTO `dic_city` VALUES ('361123', '361123', '玉山县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361124', '361124', '铅山县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361125', '361125', '横峰县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361126', '361126', '弋阳县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361127', '361127', '余干县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361128', '361128', '鄱阳县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361129', '361129', '万年县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361130', '361130', '婺源县', '3611', 3); -INSERT INTO `dic_city` VALUES ('361181', '361181', '德兴市', '3611', 3); -INSERT INTO `dic_city` VALUES ('37', '37', '山东省', NULL, 1); -INSERT INTO `dic_city` VALUES ('3701', '3701', '济南市', '37', 2); -INSERT INTO `dic_city` VALUES ('370102', '370102', '历下区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370103', '370103', '市中区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370104', '370104', '槐荫区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370105', '370105', '天桥区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370112', '370112', '历城区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370113', '370113', '长清区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370114', '370114', '章丘区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370115', '370115', '济阳区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370116', '370116', '莱芜区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370117', '370117', '钢城区', '3701', 3); -INSERT INTO `dic_city` VALUES ('370124', '370124', '平阴县', '3701', 3); -INSERT INTO `dic_city` VALUES ('370126', '370126', '商河县', '3701', 3); -INSERT INTO `dic_city` VALUES ('370171', '370171', '济南高新技术产业开发区', '3701', 3); -INSERT INTO `dic_city` VALUES ('3702', '3702', '青岛市', '37', 2); -INSERT INTO `dic_city` VALUES ('370202', '370202', '市南区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370203', '370203', '市北区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370211', '370211', '黄岛区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370212', '370212', '崂山区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370213', '370213', '李沧区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370214', '370214', '城阳区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370215', '370215', '即墨区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370271', '370271', '青岛高新技术产业开发区', '3702', 3); -INSERT INTO `dic_city` VALUES ('370281', '370281', '胶州市', '3702', 3); -INSERT INTO `dic_city` VALUES ('370283', '370283', '平度市', '3702', 3); -INSERT INTO `dic_city` VALUES ('370285', '370285', '莱西市', '3702', 3); -INSERT INTO `dic_city` VALUES ('3703', '3703', '淄博市', '37', 2); -INSERT INTO `dic_city` VALUES ('370302', '370302', '淄川区', '3703', 3); -INSERT INTO `dic_city` VALUES ('370303', '370303', '张店区', '3703', 3); -INSERT INTO `dic_city` VALUES ('370304', '370304', '博山区', '3703', 3); -INSERT INTO `dic_city` VALUES ('370305', '370305', '临淄区', '3703', 3); -INSERT INTO `dic_city` VALUES ('370306', '370306', '周村区', '3703', 3); -INSERT INTO `dic_city` VALUES ('370321', '370321', '桓台县', '3703', 3); -INSERT INTO `dic_city` VALUES ('370322', '370322', '高青县', '3703', 3); -INSERT INTO `dic_city` VALUES ('370323', '370323', '沂源县', '3703', 3); -INSERT INTO `dic_city` VALUES ('3704', '3704', '枣庄市', '37', 2); -INSERT INTO `dic_city` VALUES ('370402', '370402', '市中区', '3704', 3); -INSERT INTO `dic_city` VALUES ('370403', '370403', '薛城区', '3704', 3); -INSERT INTO `dic_city` VALUES ('370404', '370404', '峄城区', '3704', 3); -INSERT INTO `dic_city` VALUES ('370405', '370405', '台儿庄区', '3704', 3); -INSERT INTO `dic_city` VALUES ('370406', '370406', '山亭区', '3704', 3); -INSERT INTO `dic_city` VALUES ('370481', '370481', '滕州市', '3704', 3); -INSERT INTO `dic_city` VALUES ('3705', '3705', '东营市', '37', 2); -INSERT INTO `dic_city` VALUES ('370502', '370502', '东营区', '3705', 3); -INSERT INTO `dic_city` VALUES ('370503', '370503', '河口区', '3705', 3); -INSERT INTO `dic_city` VALUES ('370505', '370505', '垦利区', '3705', 3); -INSERT INTO `dic_city` VALUES ('370522', '370522', '利津县', '3705', 3); -INSERT INTO `dic_city` VALUES ('370523', '370523', '广饶县', '3705', 3); -INSERT INTO `dic_city` VALUES ('370571', '370571', '东营经济技术开发区', '3705', 3); -INSERT INTO `dic_city` VALUES ('370572', '370572', '东营港经济开发区', '3705', 3); -INSERT INTO `dic_city` VALUES ('3706', '3706', '烟台市', '37', 2); -INSERT INTO `dic_city` VALUES ('370602', '370602', '芝罘区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370611', '370611', '福山区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370612', '370612', '牟平区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370613', '370613', '莱山区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370614', '370614', '蓬莱区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370671', '370671', '烟台高新技术产业开发区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370672', '370672', '烟台经济技术开发区', '3706', 3); -INSERT INTO `dic_city` VALUES ('370681', '370681', '龙口市', '3706', 3); -INSERT INTO `dic_city` VALUES ('370682', '370682', '莱阳市', '3706', 3); -INSERT INTO `dic_city` VALUES ('370683', '370683', '莱州市', '3706', 3); -INSERT INTO `dic_city` VALUES ('370685', '370685', '招远市', '3706', 3); -INSERT INTO `dic_city` VALUES ('370686', '370686', '栖霞市', '3706', 3); -INSERT INTO `dic_city` VALUES ('370687', '370687', '海阳市', '3706', 3); -INSERT INTO `dic_city` VALUES ('3707', '3707', '潍坊市', '37', 2); -INSERT INTO `dic_city` VALUES ('370702', '370702', '潍城区', '3707', 3); -INSERT INTO `dic_city` VALUES ('370703', '370703', '寒亭区', '3707', 3); -INSERT INTO `dic_city` VALUES ('370704', '370704', '坊子区', '3707', 3); -INSERT INTO `dic_city` VALUES ('370705', '370705', '奎文区', '3707', 3); -INSERT INTO `dic_city` VALUES ('370724', '370724', '临朐县', '3707', 3); -INSERT INTO `dic_city` VALUES ('370725', '370725', '昌乐县', '3707', 3); -INSERT INTO `dic_city` VALUES ('370772', '370772', '潍坊滨海经济技术开发区', '3707', 3); -INSERT INTO `dic_city` VALUES ('370781', '370781', '青州市', '3707', 3); -INSERT INTO `dic_city` VALUES ('370782', '370782', '诸城市', '3707', 3); -INSERT INTO `dic_city` VALUES ('370783', '370783', '寿光市', '3707', 3); -INSERT INTO `dic_city` VALUES ('370784', '370784', '安丘市', '3707', 3); -INSERT INTO `dic_city` VALUES ('370785', '370785', '高密市', '3707', 3); -INSERT INTO `dic_city` VALUES ('370786', '370786', '昌邑市', '3707', 3); -INSERT INTO `dic_city` VALUES ('3708', '3708', '济宁市', '37', 2); -INSERT INTO `dic_city` VALUES ('370811', '370811', '任城区', '3708', 3); -INSERT INTO `dic_city` VALUES ('370812', '370812', '兖州区', '3708', 3); -INSERT INTO `dic_city` VALUES ('370826', '370826', '微山县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370827', '370827', '鱼台县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370828', '370828', '金乡县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370829', '370829', '嘉祥县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370830', '370830', '汶上县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370831', '370831', '泗水县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370832', '370832', '梁山县', '3708', 3); -INSERT INTO `dic_city` VALUES ('370871', '370871', '济宁高新技术产业开发区', '3708', 3); -INSERT INTO `dic_city` VALUES ('370881', '370881', '曲阜市', '3708', 3); -INSERT INTO `dic_city` VALUES ('370883', '370883', '邹城市', '3708', 3); -INSERT INTO `dic_city` VALUES ('3709', '3709', '泰安市', '37', 2); -INSERT INTO `dic_city` VALUES ('370902', '370902', '泰山区', '3709', 3); -INSERT INTO `dic_city` VALUES ('370911', '370911', '岱岳区', '3709', 3); -INSERT INTO `dic_city` VALUES ('370921', '370921', '宁阳县', '3709', 3); -INSERT INTO `dic_city` VALUES ('370923', '370923', '东平县', '3709', 3); -INSERT INTO `dic_city` VALUES ('370982', '370982', '新泰市', '3709', 3); -INSERT INTO `dic_city` VALUES ('370983', '370983', '肥城市', '3709', 3); -INSERT INTO `dic_city` VALUES ('3710', '3710', '威海市', '37', 2); -INSERT INTO `dic_city` VALUES ('371002', '371002', '环翠区', '3710', 3); -INSERT INTO `dic_city` VALUES ('371003', '371003', '文登区', '3710', 3); -INSERT INTO `dic_city` VALUES ('371071', '371071', '威海火炬高技术产业开发区', '3710', 3); -INSERT INTO `dic_city` VALUES ('371072', '371072', '威海经济技术开发区', '3710', 3); -INSERT INTO `dic_city` VALUES ('371073', '371073', '威海临港经济技术开发区', '3710', 3); -INSERT INTO `dic_city` VALUES ('371082', '371082', '荣成市', '3710', 3); -INSERT INTO `dic_city` VALUES ('371083', '371083', '乳山市', '3710', 3); -INSERT INTO `dic_city` VALUES ('3711', '3711', '日照市', '37', 2); -INSERT INTO `dic_city` VALUES ('371102', '371102', '东港区', '3711', 3); -INSERT INTO `dic_city` VALUES ('371103', '371103', '岚山区', '3711', 3); -INSERT INTO `dic_city` VALUES ('371121', '371121', '五莲县', '3711', 3); -INSERT INTO `dic_city` VALUES ('371122', '371122', '莒县', '3711', 3); -INSERT INTO `dic_city` VALUES ('371171', '371171', '日照经济技术开发区', '3711', 3); -INSERT INTO `dic_city` VALUES ('3713', '3713', '临沂市', '37', 2); -INSERT INTO `dic_city` VALUES ('371302', '371302', '兰山区', '3713', 3); -INSERT INTO `dic_city` VALUES ('371311', '371311', '罗庄区', '3713', 3); -INSERT INTO `dic_city` VALUES ('371312', '371312', '河东区', '3713', 3); -INSERT INTO `dic_city` VALUES ('371321', '371321', '沂南县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371322', '371322', '郯城县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371323', '371323', '沂水县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371324', '371324', '兰陵县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371325', '371325', '费县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371326', '371326', '平邑县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371327', '371327', '莒南县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371328', '371328', '蒙阴县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371329', '371329', '临沭县', '3713', 3); -INSERT INTO `dic_city` VALUES ('371371', '371371', '临沂高新技术产业开发区', '3713', 3); -INSERT INTO `dic_city` VALUES ('3714', '3714', '德州市', '37', 2); -INSERT INTO `dic_city` VALUES ('371402', '371402', '德城区', '3714', 3); -INSERT INTO `dic_city` VALUES ('371403', '371403', '陵城区', '3714', 3); -INSERT INTO `dic_city` VALUES ('371422', '371422', '宁津县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371423', '371423', '庆云县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371424', '371424', '临邑县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371425', '371425', '齐河县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371426', '371426', '平原县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371427', '371427', '夏津县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371428', '371428', '武城县', '3714', 3); -INSERT INTO `dic_city` VALUES ('371471', '371471', '德州经济技术开发区', '3714', 3); -INSERT INTO `dic_city` VALUES ('371472', '371472', '德州运河经济开发区', '3714', 3); -INSERT INTO `dic_city` VALUES ('371481', '371481', '乐陵市', '3714', 3); -INSERT INTO `dic_city` VALUES ('371482', '371482', '禹城市', '3714', 3); -INSERT INTO `dic_city` VALUES ('3715', '3715', '聊城市', '37', 2); -INSERT INTO `dic_city` VALUES ('371502', '371502', '东昌府区', '3715', 3); -INSERT INTO `dic_city` VALUES ('371503', '371503', '茌平区', '3715', 3); -INSERT INTO `dic_city` VALUES ('371521', '371521', '阳谷县', '3715', 3); -INSERT INTO `dic_city` VALUES ('371522', '371522', '莘县', '3715', 3); -INSERT INTO `dic_city` VALUES ('371524', '371524', '东阿县', '3715', 3); -INSERT INTO `dic_city` VALUES ('371525', '371525', '冠县', '3715', 3); -INSERT INTO `dic_city` VALUES ('371526', '371526', '高唐县', '3715', 3); -INSERT INTO `dic_city` VALUES ('371581', '371581', '临清市', '3715', 3); -INSERT INTO `dic_city` VALUES ('3716', '3716', '滨州市', '37', 2); -INSERT INTO `dic_city` VALUES ('371602', '371602', '滨城区', '3716', 3); -INSERT INTO `dic_city` VALUES ('371603', '371603', '沾化区', '3716', 3); -INSERT INTO `dic_city` VALUES ('371621', '371621', '惠民县', '3716', 3); -INSERT INTO `dic_city` VALUES ('371622', '371622', '阳信县', '3716', 3); -INSERT INTO `dic_city` VALUES ('371623', '371623', '无棣县', '3716', 3); -INSERT INTO `dic_city` VALUES ('371625', '371625', '博兴县', '3716', 3); -INSERT INTO `dic_city` VALUES ('371681', '371681', '邹平市', '3716', 3); -INSERT INTO `dic_city` VALUES ('3717', '3717', '菏泽市', '37', 2); -INSERT INTO `dic_city` VALUES ('371702', '371702', '牡丹区', '3717', 3); -INSERT INTO `dic_city` VALUES ('371703', '371703', '定陶区', '3717', 3); -INSERT INTO `dic_city` VALUES ('371721', '371721', '曹县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371722', '371722', '单县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371723', '371723', '成武县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371724', '371724', '巨野县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371725', '371725', '郓城县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371726', '371726', '鄄城县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371728', '371728', '东明县', '3717', 3); -INSERT INTO `dic_city` VALUES ('371771', '371771', '菏泽经济技术开发区', '3717', 3); -INSERT INTO `dic_city` VALUES ('371772', '371772', '菏泽高新技术开发区', '3717', 3); -INSERT INTO `dic_city` VALUES ('41', '41', '河南省', NULL, 1); -INSERT INTO `dic_city` VALUES ('4101', '4101', '郑州市', '41', 2); -INSERT INTO `dic_city` VALUES ('410102', '410102', '中原区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410103', '410103', '二七区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410104', '410104', '管城回族区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410105', '410105', '金水区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410106', '410106', '上街区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410108', '410108', '惠济区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410122', '410122', '中牟县', '4101', 3); -INSERT INTO `dic_city` VALUES ('410171', '410171', '郑州经济技术开发区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410172', '410172', '郑州高新技术产业开发区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410173', '410173', '郑州航空港经济综合实验区', '4101', 3); -INSERT INTO `dic_city` VALUES ('410181', '410181', '巩义市', '4101', 3); -INSERT INTO `dic_city` VALUES ('410182', '410182', '荥阳市', '4101', 3); -INSERT INTO `dic_city` VALUES ('410183', '410183', '新密市', '4101', 3); -INSERT INTO `dic_city` VALUES ('410184', '410184', '新郑市', '4101', 3); -INSERT INTO `dic_city` VALUES ('410185', '410185', '登封市', '4101', 3); -INSERT INTO `dic_city` VALUES ('4102', '4102', '开封市', '41', 2); -INSERT INTO `dic_city` VALUES ('410202', '410202', '龙亭区', '4102', 3); -INSERT INTO `dic_city` VALUES ('410203', '410203', '顺河回族区', '4102', 3); -INSERT INTO `dic_city` VALUES ('410204', '410204', '鼓楼区', '4102', 3); -INSERT INTO `dic_city` VALUES ('410205', '410205', '禹王台区', '4102', 3); -INSERT INTO `dic_city` VALUES ('410212', '410212', '祥符区', '4102', 3); -INSERT INTO `dic_city` VALUES ('410221', '410221', '杞县', '4102', 3); -INSERT INTO `dic_city` VALUES ('410222', '410222', '通许县', '4102', 3); -INSERT INTO `dic_city` VALUES ('410223', '410223', '尉氏县', '4102', 3); -INSERT INTO `dic_city` VALUES ('410225', '410225', '兰考县', '4102', 3); -INSERT INTO `dic_city` VALUES ('4103', '4103', '洛阳市', '41', 2); -INSERT INTO `dic_city` VALUES ('410302', '410302', '老城区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410303', '410303', '西工区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410304', '410304', '瀍河回族区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410305', '410305', '涧西区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410306', '410306', '吉利区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410311', '410311', '洛龙区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410322', '410322', '孟津县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410323', '410323', '新安县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410324', '410324', '栾川县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410325', '410325', '嵩县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410326', '410326', '汝阳县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410327', '410327', '宜阳县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410328', '410328', '洛宁县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410329', '410329', '伊川县', '4103', 3); -INSERT INTO `dic_city` VALUES ('410371', '410371', '洛阳高新技术产业开发区', '4103', 3); -INSERT INTO `dic_city` VALUES ('410381', '410381', '偃师市', '4103', 3); -INSERT INTO `dic_city` VALUES ('4104', '4104', '平顶山市', '41', 2); -INSERT INTO `dic_city` VALUES ('410402', '410402', '新华区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410403', '410403', '卫东区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410404', '410404', '石龙区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410411', '410411', '湛河区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410421', '410421', '宝丰县', '4104', 3); -INSERT INTO `dic_city` VALUES ('410422', '410422', '叶县', '4104', 3); -INSERT INTO `dic_city` VALUES ('410423', '410423', '鲁山县', '4104', 3); -INSERT INTO `dic_city` VALUES ('410425', '410425', '郏县', '4104', 3); -INSERT INTO `dic_city` VALUES ('410471', '410471', '平顶山高新技术产业开发区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410472', '410472', '平顶山市城乡一体化示范区', '4104', 3); -INSERT INTO `dic_city` VALUES ('410481', '410481', '舞钢市', '4104', 3); -INSERT INTO `dic_city` VALUES ('410482', '410482', '汝州市', '4104', 3); -INSERT INTO `dic_city` VALUES ('4105', '4105', '安阳市', '41', 2); -INSERT INTO `dic_city` VALUES ('410502', '410502', '文峰区', '4105', 3); -INSERT INTO `dic_city` VALUES ('410503', '410503', '北关区', '4105', 3); -INSERT INTO `dic_city` VALUES ('410505', '410505', '殷都区', '4105', 3); -INSERT INTO `dic_city` VALUES ('410506', '410506', '龙安区', '4105', 3); -INSERT INTO `dic_city` VALUES ('410522', '410522', '安阳县', '4105', 3); -INSERT INTO `dic_city` VALUES ('410523', '410523', '汤阴县', '4105', 3); -INSERT INTO `dic_city` VALUES ('410526', '410526', '滑县', '4105', 3); -INSERT INTO `dic_city` VALUES ('410527', '410527', '内黄县', '4105', 3); -INSERT INTO `dic_city` VALUES ('410571', '410571', '安阳高新技术产业开发区', '4105', 3); -INSERT INTO `dic_city` VALUES ('410581', '410581', '林州市', '4105', 3); -INSERT INTO `dic_city` VALUES ('4106', '4106', '鹤壁市', '41', 2); -INSERT INTO `dic_city` VALUES ('410602', '410602', '鹤山区', '4106', 3); -INSERT INTO `dic_city` VALUES ('410603', '410603', '山城区', '4106', 3); -INSERT INTO `dic_city` VALUES ('410611', '410611', '淇滨区', '4106', 3); -INSERT INTO `dic_city` VALUES ('410621', '410621', '浚县', '4106', 3); -INSERT INTO `dic_city` VALUES ('410622', '410622', '淇县', '4106', 3); -INSERT INTO `dic_city` VALUES ('410671', '410671', '鹤壁经济技术开发区', '4106', 3); -INSERT INTO `dic_city` VALUES ('4107', '4107', '新乡市', '41', 2); -INSERT INTO `dic_city` VALUES ('410702', '410702', '红旗区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410703', '410703', '卫滨区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410704', '410704', '凤泉区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410711', '410711', '牧野区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410721', '410721', '新乡县', '4107', 3); -INSERT INTO `dic_city` VALUES ('410724', '410724', '获嘉县', '4107', 3); -INSERT INTO `dic_city` VALUES ('410725', '410725', '原阳县', '4107', 3); -INSERT INTO `dic_city` VALUES ('410726', '410726', '延津县', '4107', 3); -INSERT INTO `dic_city` VALUES ('410727', '410727', '封丘县', '4107', 3); -INSERT INTO `dic_city` VALUES ('410771', '410771', '新乡高新技术产业开发区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410772', '410772', '新乡经济技术开发区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410773', '410773', '新乡市平原城乡一体化示范区', '4107', 3); -INSERT INTO `dic_city` VALUES ('410781', '410781', '卫辉市', '4107', 3); -INSERT INTO `dic_city` VALUES ('410782', '410782', '辉县市', '4107', 3); -INSERT INTO `dic_city` VALUES ('410783', '410783', '长垣市', '4107', 3); -INSERT INTO `dic_city` VALUES ('4108', '4108', '焦作市', '41', 2); -INSERT INTO `dic_city` VALUES ('410802', '410802', '解放区', '4108', 3); -INSERT INTO `dic_city` VALUES ('410803', '410803', '中站区', '4108', 3); -INSERT INTO `dic_city` VALUES ('410804', '410804', '马村区', '4108', 3); -INSERT INTO `dic_city` VALUES ('410811', '410811', '山阳区', '4108', 3); -INSERT INTO `dic_city` VALUES ('410821', '410821', '修武县', '4108', 3); -INSERT INTO `dic_city` VALUES ('410822', '410822', '博爱县', '4108', 3); -INSERT INTO `dic_city` VALUES ('410823', '410823', '武陟县', '4108', 3); -INSERT INTO `dic_city` VALUES ('410825', '410825', '温县', '4108', 3); -INSERT INTO `dic_city` VALUES ('410871', '410871', '焦作城乡一体化示范区', '4108', 3); -INSERT INTO `dic_city` VALUES ('410882', '410882', '沁阳市', '4108', 3); -INSERT INTO `dic_city` VALUES ('410883', '410883', '孟州市', '4108', 3); -INSERT INTO `dic_city` VALUES ('4109', '4109', '濮阳市', '41', 2); -INSERT INTO `dic_city` VALUES ('410902', '410902', '华龙区', '4109', 3); -INSERT INTO `dic_city` VALUES ('410922', '410922', '清丰县', '4109', 3); -INSERT INTO `dic_city` VALUES ('410923', '410923', '南乐县', '4109', 3); -INSERT INTO `dic_city` VALUES ('410926', '410926', '范县', '4109', 3); -INSERT INTO `dic_city` VALUES ('410927', '410927', '台前县', '4109', 3); -INSERT INTO `dic_city` VALUES ('410928', '410928', '濮阳县', '4109', 3); -INSERT INTO `dic_city` VALUES ('410971', '410971', '河南濮阳工业园区', '4109', 3); -INSERT INTO `dic_city` VALUES ('410972', '410972', '濮阳经济技术开发区', '4109', 3); -INSERT INTO `dic_city` VALUES ('4110', '4110', '许昌市', '41', 2); -INSERT INTO `dic_city` VALUES ('411002', '411002', '魏都区', '4110', 3); -INSERT INTO `dic_city` VALUES ('411003', '411003', '建安区', '4110', 3); -INSERT INTO `dic_city` VALUES ('411024', '411024', '鄢陵县', '4110', 3); -INSERT INTO `dic_city` VALUES ('411025', '411025', '襄城县', '4110', 3); -INSERT INTO `dic_city` VALUES ('411071', '411071', '许昌经济技术开发区', '4110', 3); -INSERT INTO `dic_city` VALUES ('411081', '411081', '禹州市', '4110', 3); -INSERT INTO `dic_city` VALUES ('411082', '411082', '长葛市', '4110', 3); -INSERT INTO `dic_city` VALUES ('4111', '4111', '漯河市', '41', 2); -INSERT INTO `dic_city` VALUES ('411102', '411102', '源汇区', '4111', 3); -INSERT INTO `dic_city` VALUES ('411103', '411103', '郾城区', '4111', 3); -INSERT INTO `dic_city` VALUES ('411104', '411104', '召陵区', '4111', 3); -INSERT INTO `dic_city` VALUES ('411121', '411121', '舞阳县', '4111', 3); -INSERT INTO `dic_city` VALUES ('411122', '411122', '临颍县', '4111', 3); -INSERT INTO `dic_city` VALUES ('411171', '411171', '漯河经济技术开发区', '4111', 3); -INSERT INTO `dic_city` VALUES ('4112', '4112', '三门峡市', '41', 2); -INSERT INTO `dic_city` VALUES ('411202', '411202', '湖滨区', '4112', 3); -INSERT INTO `dic_city` VALUES ('411203', '411203', '陕州区', '4112', 3); -INSERT INTO `dic_city` VALUES ('411221', '411221', '渑池县', '4112', 3); -INSERT INTO `dic_city` VALUES ('411224', '411224', '卢氏县', '4112', 3); -INSERT INTO `dic_city` VALUES ('411271', '411271', '河南三门峡经济开发区', '4112', 3); -INSERT INTO `dic_city` VALUES ('411281', '411281', '义马市', '4112', 3); -INSERT INTO `dic_city` VALUES ('411282', '411282', '灵宝市', '4112', 3); -INSERT INTO `dic_city` VALUES ('4113', '4113', '南阳市', '41', 2); -INSERT INTO `dic_city` VALUES ('411302', '411302', '宛城区', '4113', 3); -INSERT INTO `dic_city` VALUES ('411303', '411303', '卧龙区', '4113', 3); -INSERT INTO `dic_city` VALUES ('411321', '411321', '南召县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411322', '411322', '方城县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411323', '411323', '西峡县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411324', '411324', '镇平县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411325', '411325', '内乡县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411326', '411326', '淅川县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411327', '411327', '社旗县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411328', '411328', '唐河县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411329', '411329', '新野县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411330', '411330', '桐柏县', '4113', 3); -INSERT INTO `dic_city` VALUES ('411371', '411371', '南阳高新技术产业开发区', '4113', 3); -INSERT INTO `dic_city` VALUES ('411372', '411372', '南阳市城乡一体化示范区', '4113', 3); -INSERT INTO `dic_city` VALUES ('411381', '411381', '邓州市', '4113', 3); -INSERT INTO `dic_city` VALUES ('4114', '4114', '商丘市', '41', 2); -INSERT INTO `dic_city` VALUES ('411402', '411402', '梁园区', '4114', 3); -INSERT INTO `dic_city` VALUES ('411403', '411403', '睢阳区', '4114', 3); -INSERT INTO `dic_city` VALUES ('411421', '411421', '民权县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411422', '411422', '睢县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411423', '411423', '宁陵县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411424', '411424', '柘城县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411425', '411425', '虞城县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411426', '411426', '夏邑县', '4114', 3); -INSERT INTO `dic_city` VALUES ('411471', '411471', '豫东综合物流产业聚集区', '4114', 3); -INSERT INTO `dic_city` VALUES ('411472', '411472', '河南商丘经济开发区', '4114', 3); -INSERT INTO `dic_city` VALUES ('411481', '411481', '永城市', '4114', 3); -INSERT INTO `dic_city` VALUES ('4115', '4115', '信阳市', '41', 2); -INSERT INTO `dic_city` VALUES ('411502', '411502', '浉河区', '4115', 3); -INSERT INTO `dic_city` VALUES ('411503', '411503', '平桥区', '4115', 3); -INSERT INTO `dic_city` VALUES ('411521', '411521', '罗山县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411522', '411522', '光山县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411523', '411523', '新县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411524', '411524', '商城县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411525', '411525', '固始县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411526', '411526', '潢川县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411527', '411527', '淮滨县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411528', '411528', '息县', '4115', 3); -INSERT INTO `dic_city` VALUES ('411571', '411571', '信阳高新技术产业开发区', '4115', 3); -INSERT INTO `dic_city` VALUES ('4116', '4116', '周口市', '41', 2); -INSERT INTO `dic_city` VALUES ('411602', '411602', '川汇区', '4116', 3); -INSERT INTO `dic_city` VALUES ('411603', '411603', '淮阳区', '4116', 3); -INSERT INTO `dic_city` VALUES ('411621', '411621', '扶沟县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411622', '411622', '西华县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411623', '411623', '商水县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411624', '411624', '沈丘县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411625', '411625', '郸城县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411627', '411627', '太康县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411628', '411628', '鹿邑县', '4116', 3); -INSERT INTO `dic_city` VALUES ('411671', '411671', '河南周口经济开发区', '4116', 3); -INSERT INTO `dic_city` VALUES ('411681', '411681', '项城市', '4116', 3); -INSERT INTO `dic_city` VALUES ('4117', '4117', '驻马店市', '41', 2); -INSERT INTO `dic_city` VALUES ('411702', '411702', '驿城区', '4117', 3); -INSERT INTO `dic_city` VALUES ('411721', '411721', '西平县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411722', '411722', '上蔡县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411723', '411723', '平舆县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411724', '411724', '正阳县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411725', '411725', '确山县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411726', '411726', '泌阳县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411727', '411727', '汝南县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411728', '411728', '遂平县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411729', '411729', '新蔡县', '4117', 3); -INSERT INTO `dic_city` VALUES ('411771', '411771', '河南驻马店经济开发区', '4117', 3); -INSERT INTO `dic_city` VALUES ('4190', '4190', '省直辖县级行政区划', '41', 2); -INSERT INTO `dic_city` VALUES ('419001', '419001', '济源市', '4190', 3); -INSERT INTO `dic_city` VALUES ('42', '42', '湖北省', NULL, 1); -INSERT INTO `dic_city` VALUES ('4201', '4201', '武汉市', '42', 2); -INSERT INTO `dic_city` VALUES ('420102', '420102', '江岸区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420103', '420103', '江汉区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420104', '420104', '硚口区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420105', '420105', '汉阳区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420106', '420106', '武昌区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420107', '420107', '青山区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420111', '420111', '洪山区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420112', '420112', '东西湖区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420113', '420113', '汉南区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420114', '420114', '蔡甸区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420115', '420115', '江夏区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420116', '420116', '黄陂区', '4201', 3); -INSERT INTO `dic_city` VALUES ('420117', '420117', '新洲区', '4201', 3); -INSERT INTO `dic_city` VALUES ('4202', '4202', '黄石市', '42', 2); -INSERT INTO `dic_city` VALUES ('420202', '420202', '黄石港区', '4202', 3); -INSERT INTO `dic_city` VALUES ('420203', '420203', '西塞山区', '4202', 3); -INSERT INTO `dic_city` VALUES ('420204', '420204', '下陆区', '4202', 3); -INSERT INTO `dic_city` VALUES ('420205', '420205', '铁山区', '4202', 3); -INSERT INTO `dic_city` VALUES ('420222', '420222', '阳新县', '4202', 3); -INSERT INTO `dic_city` VALUES ('420281', '420281', '大冶市', '4202', 3); -INSERT INTO `dic_city` VALUES ('4203', '4203', '十堰市', '42', 2); -INSERT INTO `dic_city` VALUES ('420302', '420302', '茅箭区', '4203', 3); -INSERT INTO `dic_city` VALUES ('420303', '420303', '张湾区', '4203', 3); -INSERT INTO `dic_city` VALUES ('420304', '420304', '郧阳区', '4203', 3); -INSERT INTO `dic_city` VALUES ('420322', '420322', '郧西县', '4203', 3); -INSERT INTO `dic_city` VALUES ('420323', '420323', '竹山县', '4203', 3); -INSERT INTO `dic_city` VALUES ('420324', '420324', '竹溪县', '4203', 3); -INSERT INTO `dic_city` VALUES ('420325', '420325', '房县', '4203', 3); -INSERT INTO `dic_city` VALUES ('420381', '420381', '丹江口市', '4203', 3); -INSERT INTO `dic_city` VALUES ('4205', '4205', '宜昌市', '42', 2); -INSERT INTO `dic_city` VALUES ('420502', '420502', '西陵区', '4205', 3); -INSERT INTO `dic_city` VALUES ('420503', '420503', '伍家岗区', '4205', 3); -INSERT INTO `dic_city` VALUES ('420504', '420504', '点军区', '4205', 3); -INSERT INTO `dic_city` VALUES ('420505', '420505', '猇亭区', '4205', 3); -INSERT INTO `dic_city` VALUES ('420506', '420506', '夷陵区', '4205', 3); -INSERT INTO `dic_city` VALUES ('420525', '420525', '远安县', '4205', 3); -INSERT INTO `dic_city` VALUES ('420526', '420526', '兴山县', '4205', 3); -INSERT INTO `dic_city` VALUES ('420527', '420527', '秭归县', '4205', 3); -INSERT INTO `dic_city` VALUES ('420528', '420528', '长阳土家族自治县', '4205', 3); -INSERT INTO `dic_city` VALUES ('420529', '420529', '五峰土家族自治县', '4205', 3); -INSERT INTO `dic_city` VALUES ('420581', '420581', '宜都市', '4205', 3); -INSERT INTO `dic_city` VALUES ('420582', '420582', '当阳市', '4205', 3); -INSERT INTO `dic_city` VALUES ('420583', '420583', '枝江市', '4205', 3); -INSERT INTO `dic_city` VALUES ('4206', '4206', '襄阳市', '42', 2); -INSERT INTO `dic_city` VALUES ('420602', '420602', '襄城区', '4206', 3); -INSERT INTO `dic_city` VALUES ('420606', '420606', '樊城区', '4206', 3); -INSERT INTO `dic_city` VALUES ('420607', '420607', '襄州区', '4206', 3); -INSERT INTO `dic_city` VALUES ('420624', '420624', '南漳县', '4206', 3); -INSERT INTO `dic_city` VALUES ('420625', '420625', '谷城县', '4206', 3); -INSERT INTO `dic_city` VALUES ('420626', '420626', '保康县', '4206', 3); -INSERT INTO `dic_city` VALUES ('420682', '420682', '老河口市', '4206', 3); -INSERT INTO `dic_city` VALUES ('420683', '420683', '枣阳市', '4206', 3); -INSERT INTO `dic_city` VALUES ('420684', '420684', '宜城市', '4206', 3); -INSERT INTO `dic_city` VALUES ('4207', '4207', '鄂州市', '42', 2); -INSERT INTO `dic_city` VALUES ('420702', '420702', '梁子湖区', '4207', 3); -INSERT INTO `dic_city` VALUES ('420703', '420703', '华容区', '4207', 3); -INSERT INTO `dic_city` VALUES ('420704', '420704', '鄂城区', '4207', 3); -INSERT INTO `dic_city` VALUES ('4208', '4208', '荆门市', '42', 2); -INSERT INTO `dic_city` VALUES ('420802', '420802', '东宝区', '4208', 3); -INSERT INTO `dic_city` VALUES ('420804', '420804', '掇刀区', '4208', 3); -INSERT INTO `dic_city` VALUES ('420822', '420822', '沙洋县', '4208', 3); -INSERT INTO `dic_city` VALUES ('420881', '420881', '钟祥市', '4208', 3); -INSERT INTO `dic_city` VALUES ('420882', '420882', '京山市', '4208', 3); -INSERT INTO `dic_city` VALUES ('4209', '4209', '孝感市', '42', 2); -INSERT INTO `dic_city` VALUES ('420902', '420902', '孝南区', '4209', 3); -INSERT INTO `dic_city` VALUES ('420921', '420921', '孝昌县', '4209', 3); -INSERT INTO `dic_city` VALUES ('420922', '420922', '大悟县', '4209', 3); -INSERT INTO `dic_city` VALUES ('420923', '420923', '云梦县', '4209', 3); -INSERT INTO `dic_city` VALUES ('420981', '420981', '应城市', '4209', 3); -INSERT INTO `dic_city` VALUES ('420982', '420982', '安陆市', '4209', 3); -INSERT INTO `dic_city` VALUES ('420984', '420984', '汉川市', '4209', 3); -INSERT INTO `dic_city` VALUES ('4210', '4210', '荆州市', '42', 2); -INSERT INTO `dic_city` VALUES ('421002', '421002', '沙市区', '4210', 3); -INSERT INTO `dic_city` VALUES ('421003', '421003', '荆州区', '4210', 3); -INSERT INTO `dic_city` VALUES ('421022', '421022', '公安县', '4210', 3); -INSERT INTO `dic_city` VALUES ('421023', '421023', '监利县', '4210', 3); -INSERT INTO `dic_city` VALUES ('421024', '421024', '江陵县', '4210', 3); -INSERT INTO `dic_city` VALUES ('421071', '421071', '荆州经济技术开发区', '4210', 3); -INSERT INTO `dic_city` VALUES ('421081', '421081', '石首市', '4210', 3); -INSERT INTO `dic_city` VALUES ('421083', '421083', '洪湖市', '4210', 3); -INSERT INTO `dic_city` VALUES ('421087', '421087', '松滋市', '4210', 3); -INSERT INTO `dic_city` VALUES ('4211', '4211', '黄冈市', '42', 2); -INSERT INTO `dic_city` VALUES ('421102', '421102', '黄州区', '4211', 3); -INSERT INTO `dic_city` VALUES ('421121', '421121', '团风县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421122', '421122', '红安县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421123', '421123', '罗田县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421124', '421124', '英山县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421125', '421125', '浠水县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421126', '421126', '蕲春县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421127', '421127', '黄梅县', '4211', 3); -INSERT INTO `dic_city` VALUES ('421171', '421171', '龙感湖管理区', '4211', 3); -INSERT INTO `dic_city` VALUES ('421181', '421181', '麻城市', '4211', 3); -INSERT INTO `dic_city` VALUES ('421182', '421182', '武穴市', '4211', 3); -INSERT INTO `dic_city` VALUES ('4212', '4212', '咸宁市', '42', 2); -INSERT INTO `dic_city` VALUES ('421202', '421202', '咸安区', '4212', 3); -INSERT INTO `dic_city` VALUES ('421221', '421221', '嘉鱼县', '4212', 3); -INSERT INTO `dic_city` VALUES ('421222', '421222', '通城县', '4212', 3); -INSERT INTO `dic_city` VALUES ('421223', '421223', '崇阳县', '4212', 3); -INSERT INTO `dic_city` VALUES ('421224', '421224', '通山县', '4212', 3); -INSERT INTO `dic_city` VALUES ('421281', '421281', '赤壁市', '4212', 3); -INSERT INTO `dic_city` VALUES ('4213', '4213', '随州市', '42', 2); -INSERT INTO `dic_city` VALUES ('421303', '421303', '曾都区', '4213', 3); -INSERT INTO `dic_city` VALUES ('421321', '421321', '随县', '4213', 3); -INSERT INTO `dic_city` VALUES ('421381', '421381', '广水市', '4213', 3); -INSERT INTO `dic_city` VALUES ('4228', '4228', '恩施土家族苗族自治州', '42', 2); -INSERT INTO `dic_city` VALUES ('422801', '422801', '恩施市', '4228', 3); -INSERT INTO `dic_city` VALUES ('422802', '422802', '利川市', '4228', 3); -INSERT INTO `dic_city` VALUES ('422822', '422822', '建始县', '4228', 3); -INSERT INTO `dic_city` VALUES ('422823', '422823', '巴东县', '4228', 3); -INSERT INTO `dic_city` VALUES ('422825', '422825', '宣恩县', '4228', 3); -INSERT INTO `dic_city` VALUES ('422826', '422826', '咸丰县', '4228', 3); -INSERT INTO `dic_city` VALUES ('422827', '422827', '来凤县', '4228', 3); -INSERT INTO `dic_city` VALUES ('422828', '422828', '鹤峰县', '4228', 3); -INSERT INTO `dic_city` VALUES ('4290', '4290', '省直辖县级行政区划', '42', 2); -INSERT INTO `dic_city` VALUES ('429004', '429004', '仙桃市', '4290', 3); -INSERT INTO `dic_city` VALUES ('429005', '429005', '潜江市', '4290', 3); -INSERT INTO `dic_city` VALUES ('429006', '429006', '天门市', '4290', 3); -INSERT INTO `dic_city` VALUES ('429021', '429021', '神农架林区', '4290', 3); -INSERT INTO `dic_city` VALUES ('43', '43', '湖南省', NULL, 1); -INSERT INTO `dic_city` VALUES ('4301', '4301', '长沙市', '43', 2); -INSERT INTO `dic_city` VALUES ('430102', '430102', '芙蓉区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430103', '430103', '天心区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430104', '430104', '岳麓区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430105', '430105', '开福区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430111', '430111', '雨花区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430112', '430112', '望城区', '4301', 3); -INSERT INTO `dic_city` VALUES ('430121', '430121', '长沙县', '4301', 3); -INSERT INTO `dic_city` VALUES ('430181', '430181', '浏阳市', '4301', 3); -INSERT INTO `dic_city` VALUES ('430182', '430182', '宁乡市', '4301', 3); -INSERT INTO `dic_city` VALUES ('4302', '4302', '株洲市', '43', 2); -INSERT INTO `dic_city` VALUES ('430202', '430202', '荷塘区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430203', '430203', '芦淞区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430204', '430204', '石峰区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430211', '430211', '天元区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430212', '430212', '渌口区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430223', '430223', '攸县', '4302', 3); -INSERT INTO `dic_city` VALUES ('430224', '430224', '茶陵县', '4302', 3); -INSERT INTO `dic_city` VALUES ('430225', '430225', '炎陵县', '4302', 3); -INSERT INTO `dic_city` VALUES ('430271', '430271', '云龙示范区', '4302', 3); -INSERT INTO `dic_city` VALUES ('430281', '430281', '醴陵市', '4302', 3); -INSERT INTO `dic_city` VALUES ('4303', '4303', '湘潭市', '43', 2); -INSERT INTO `dic_city` VALUES ('430302', '430302', '雨湖区', '4303', 3); -INSERT INTO `dic_city` VALUES ('430304', '430304', '岳塘区', '4303', 3); -INSERT INTO `dic_city` VALUES ('430321', '430321', '湘潭县', '4303', 3); -INSERT INTO `dic_city` VALUES ('430371', '430371', '湖南湘潭高新技术产业园区', '4303', 3); -INSERT INTO `dic_city` VALUES ('430372', '430372', '湘潭昭山示范区', '4303', 3); -INSERT INTO `dic_city` VALUES ('430373', '430373', '湘潭九华示范区', '4303', 3); -INSERT INTO `dic_city` VALUES ('430381', '430381', '湘乡市', '4303', 3); -INSERT INTO `dic_city` VALUES ('430382', '430382', '韶山市', '4303', 3); -INSERT INTO `dic_city` VALUES ('4304', '4304', '衡阳市', '43', 2); -INSERT INTO `dic_city` VALUES ('430405', '430405', '珠晖区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430406', '430406', '雁峰区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430407', '430407', '石鼓区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430408', '430408', '蒸湘区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430412', '430412', '南岳区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430421', '430421', '衡阳县', '4304', 3); -INSERT INTO `dic_city` VALUES ('430422', '430422', '衡南县', '4304', 3); -INSERT INTO `dic_city` VALUES ('430423', '430423', '衡山县', '4304', 3); -INSERT INTO `dic_city` VALUES ('430424', '430424', '衡东县', '4304', 3); -INSERT INTO `dic_city` VALUES ('430426', '430426', '祁东县', '4304', 3); -INSERT INTO `dic_city` VALUES ('430471', '430471', '衡阳综合保税区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430472', '430472', '湖南衡阳高新技术产业园区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430473', '430473', '湖南衡阳松木经济开发区', '4304', 3); -INSERT INTO `dic_city` VALUES ('430481', '430481', '耒阳市', '4304', 3); -INSERT INTO `dic_city` VALUES ('430482', '430482', '常宁市', '4304', 3); -INSERT INTO `dic_city` VALUES ('4305', '4305', '邵阳市', '43', 2); -INSERT INTO `dic_city` VALUES ('430502', '430502', '双清区', '4305', 3); -INSERT INTO `dic_city` VALUES ('430503', '430503', '大祥区', '4305', 3); -INSERT INTO `dic_city` VALUES ('430511', '430511', '北塔区', '4305', 3); -INSERT INTO `dic_city` VALUES ('430522', '430522', '新邵县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430523', '430523', '邵阳县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430524', '430524', '隆回县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430525', '430525', '洞口县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430527', '430527', '绥宁县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430528', '430528', '新宁县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430529', '430529', '城步苗族自治县', '4305', 3); -INSERT INTO `dic_city` VALUES ('430581', '430581', '武冈市', '4305', 3); -INSERT INTO `dic_city` VALUES ('430582', '430582', '邵东市', '4305', 3); -INSERT INTO `dic_city` VALUES ('4306', '4306', '岳阳市', '43', 2); -INSERT INTO `dic_city` VALUES ('430602', '430602', '岳阳楼区', '4306', 3); -INSERT INTO `dic_city` VALUES ('430603', '430603', '云溪区', '4306', 3); -INSERT INTO `dic_city` VALUES ('430611', '430611', '君山区', '4306', 3); -INSERT INTO `dic_city` VALUES ('430621', '430621', '岳阳县', '4306', 3); -INSERT INTO `dic_city` VALUES ('430623', '430623', '华容县', '4306', 3); -INSERT INTO `dic_city` VALUES ('430624', '430624', '湘阴县', '4306', 3); -INSERT INTO `dic_city` VALUES ('430626', '430626', '平江县', '4306', 3); -INSERT INTO `dic_city` VALUES ('430671', '430671', '岳阳市屈原管理区', '4306', 3); -INSERT INTO `dic_city` VALUES ('430681', '430681', '汨罗市', '4306', 3); -INSERT INTO `dic_city` VALUES ('430682', '430682', '临湘市', '4306', 3); -INSERT INTO `dic_city` VALUES ('4307', '4307', '常德市', '43', 2); -INSERT INTO `dic_city` VALUES ('430702', '430702', '武陵区', '4307', 3); -INSERT INTO `dic_city` VALUES ('430703', '430703', '鼎城区', '4307', 3); -INSERT INTO `dic_city` VALUES ('430721', '430721', '安乡县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430722', '430722', '汉寿县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430723', '430723', '澧县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430724', '430724', '临澧县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430725', '430725', '桃源县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430726', '430726', '石门县', '4307', 3); -INSERT INTO `dic_city` VALUES ('430771', '430771', '常德市西洞庭管理区', '4307', 3); -INSERT INTO `dic_city` VALUES ('430781', '430781', '津市市', '4307', 3); -INSERT INTO `dic_city` VALUES ('4308', '4308', '张家界市', '43', 2); -INSERT INTO `dic_city` VALUES ('430802', '430802', '永定区', '4308', 3); -INSERT INTO `dic_city` VALUES ('430811', '430811', '武陵源区', '4308', 3); -INSERT INTO `dic_city` VALUES ('430821', '430821', '慈利县', '4308', 3); -INSERT INTO `dic_city` VALUES ('430822', '430822', '桑植县', '4308', 3); -INSERT INTO `dic_city` VALUES ('4309', '4309', '益阳市', '43', 2); -INSERT INTO `dic_city` VALUES ('430902', '430902', '资阳区', '4309', 3); -INSERT INTO `dic_city` VALUES ('430903', '430903', '赫山区', '4309', 3); -INSERT INTO `dic_city` VALUES ('430921', '430921', '南县', '4309', 3); -INSERT INTO `dic_city` VALUES ('430922', '430922', '桃江县', '4309', 3); -INSERT INTO `dic_city` VALUES ('430923', '430923', '安化县', '4309', 3); -INSERT INTO `dic_city` VALUES ('430971', '430971', '益阳市大通湖管理区', '4309', 3); -INSERT INTO `dic_city` VALUES ('430972', '430972', '湖南益阳高新技术产业园区', '4309', 3); -INSERT INTO `dic_city` VALUES ('430981', '430981', '沅江市', '4309', 3); -INSERT INTO `dic_city` VALUES ('4310', '4310', '郴州市', '43', 2); -INSERT INTO `dic_city` VALUES ('431002', '431002', '北湖区', '4310', 3); -INSERT INTO `dic_city` VALUES ('431003', '431003', '苏仙区', '4310', 3); -INSERT INTO `dic_city` VALUES ('431021', '431021', '桂阳县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431022', '431022', '宜章县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431023', '431023', '永兴县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431024', '431024', '嘉禾县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431025', '431025', '临武县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431026', '431026', '汝城县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431027', '431027', '桂东县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431028', '431028', '安仁县', '4310', 3); -INSERT INTO `dic_city` VALUES ('431081', '431081', '资兴市', '4310', 3); -INSERT INTO `dic_city` VALUES ('4311', '4311', '永州市', '43', 2); -INSERT INTO `dic_city` VALUES ('431102', '431102', '零陵区', '4311', 3); -INSERT INTO `dic_city` VALUES ('431103', '431103', '冷水滩区', '4311', 3); -INSERT INTO `dic_city` VALUES ('431121', '431121', '祁阳县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431122', '431122', '东安县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431123', '431123', '双牌县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431124', '431124', '道县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431125', '431125', '江永县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431126', '431126', '宁远县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431127', '431127', '蓝山县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431128', '431128', '新田县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431129', '431129', '江华瑶族自治县', '4311', 3); -INSERT INTO `dic_city` VALUES ('431171', '431171', '永州经济技术开发区', '4311', 3); -INSERT INTO `dic_city` VALUES ('431172', '431172', '永州市金洞管理区', '4311', 3); -INSERT INTO `dic_city` VALUES ('431173', '431173', '永州市回龙圩管理区', '4311', 3); -INSERT INTO `dic_city` VALUES ('4312', '4312', '怀化市', '43', 2); -INSERT INTO `dic_city` VALUES ('431202', '431202', '鹤城区', '4312', 3); -INSERT INTO `dic_city` VALUES ('431221', '431221', '中方县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431222', '431222', '沅陵县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431223', '431223', '辰溪县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431224', '431224', '溆浦县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431225', '431225', '会同县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431226', '431226', '麻阳苗族自治县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431227', '431227', '新晃侗族自治县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431228', '431228', '芷江侗族自治县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431229', '431229', '靖州苗族侗族自治县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431230', '431230', '通道侗族自治县', '4312', 3); -INSERT INTO `dic_city` VALUES ('431271', '431271', '怀化市洪江管理区', '4312', 3); -INSERT INTO `dic_city` VALUES ('431281', '431281', '洪江市', '4312', 3); -INSERT INTO `dic_city` VALUES ('4313', '4313', '娄底市', '43', 2); -INSERT INTO `dic_city` VALUES ('431302', '431302', '娄星区', '4313', 3); -INSERT INTO `dic_city` VALUES ('431321', '431321', '双峰县', '4313', 3); -INSERT INTO `dic_city` VALUES ('431322', '431322', '新化县', '4313', 3); -INSERT INTO `dic_city` VALUES ('431381', '431381', '冷水江市', '4313', 3); -INSERT INTO `dic_city` VALUES ('431382', '431382', '涟源市', '4313', 3); -INSERT INTO `dic_city` VALUES ('4331', '4331', '湘西土家族苗族自治州', '43', 2); -INSERT INTO `dic_city` VALUES ('433101', '433101', '吉首市', '4331', 3); -INSERT INTO `dic_city` VALUES ('433122', '433122', '泸溪县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433123', '433123', '凤凰县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433124', '433124', '花垣县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433125', '433125', '保靖县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433126', '433126', '古丈县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433127', '433127', '永顺县', '4331', 3); -INSERT INTO `dic_city` VALUES ('433130', '433130', '龙山县', '4331', 3); -INSERT INTO `dic_city` VALUES ('44', '44', '广东省', NULL, 1); -INSERT INTO `dic_city` VALUES ('4401', '4401', '广州市', '44', 2); -INSERT INTO `dic_city` VALUES ('440103', '440103', '荔湾区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440104', '440104', '越秀区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440105', '440105', '海珠区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440106', '440106', '天河区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440111', '440111', '白云区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440112', '440112', '黄埔区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440113', '440113', '番禺区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440114', '440114', '花都区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440115', '440115', '南沙区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440117', '440117', '从化区', '4401', 3); -INSERT INTO `dic_city` VALUES ('440118', '440118', '增城区', '4401', 3); -INSERT INTO `dic_city` VALUES ('4402', '4402', '韶关市', '44', 2); -INSERT INTO `dic_city` VALUES ('440203', '440203', '武江区', '4402', 3); -INSERT INTO `dic_city` VALUES ('440204', '440204', '浈江区', '4402', 3); -INSERT INTO `dic_city` VALUES ('440205', '440205', '曲江区', '4402', 3); -INSERT INTO `dic_city` VALUES ('440222', '440222', '始兴县', '4402', 3); -INSERT INTO `dic_city` VALUES ('440224', '440224', '仁化县', '4402', 3); -INSERT INTO `dic_city` VALUES ('440229', '440229', '翁源县', '4402', 3); -INSERT INTO `dic_city` VALUES ('440232', '440232', '乳源瑶族自治县', '4402', 3); -INSERT INTO `dic_city` VALUES ('440233', '440233', '新丰县', '4402', 3); -INSERT INTO `dic_city` VALUES ('440281', '440281', '乐昌市', '4402', 3); -INSERT INTO `dic_city` VALUES ('440282', '440282', '南雄市', '4402', 3); -INSERT INTO `dic_city` VALUES ('4403', '4403', '深圳市', '44', 2); -INSERT INTO `dic_city` VALUES ('440303', '440303', '罗湖区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440304', '440304', '福田区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440305', '440305', '南山区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440306', '440306', '宝安区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440307', '440307', '龙岗区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440308', '440308', '盐田区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440309', '440309', '龙华区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440310', '440310', '坪山区', '4403', 3); -INSERT INTO `dic_city` VALUES ('440311', '440311', '光明区', '4403', 3); -INSERT INTO `dic_city` VALUES ('4404', '4404', '珠海市', '44', 2); -INSERT INTO `dic_city` VALUES ('440402', '440402', '香洲区', '4404', 3); -INSERT INTO `dic_city` VALUES ('440403', '440403', '斗门区', '4404', 3); -INSERT INTO `dic_city` VALUES ('440404', '440404', '金湾区', '4404', 3); -INSERT INTO `dic_city` VALUES ('4405', '4405', '汕头市', '44', 2); -INSERT INTO `dic_city` VALUES ('440507', '440507', '龙湖区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440511', '440511', '金平区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440512', '440512', '濠江区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440513', '440513', '潮阳区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440514', '440514', '潮南区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440515', '440515', '澄海区', '4405', 3); -INSERT INTO `dic_city` VALUES ('440523', '440523', '南澳县', '4405', 3); -INSERT INTO `dic_city` VALUES ('4406', '4406', '佛山市', '44', 2); -INSERT INTO `dic_city` VALUES ('440604', '440604', '禅城区', '4406', 3); -INSERT INTO `dic_city` VALUES ('440605', '440605', '南海区', '4406', 3); -INSERT INTO `dic_city` VALUES ('440606', '440606', '顺德区', '4406', 3); -INSERT INTO `dic_city` VALUES ('440607', '440607', '三水区', '4406', 3); -INSERT INTO `dic_city` VALUES ('440608', '440608', '高明区', '4406', 3); -INSERT INTO `dic_city` VALUES ('4407', '4407', '江门市', '44', 2); -INSERT INTO `dic_city` VALUES ('440703', '440703', '蓬江区', '4407', 3); -INSERT INTO `dic_city` VALUES ('440704', '440704', '江海区', '4407', 3); -INSERT INTO `dic_city` VALUES ('440705', '440705', '新会区', '4407', 3); -INSERT INTO `dic_city` VALUES ('440781', '440781', '台山市', '4407', 3); -INSERT INTO `dic_city` VALUES ('440783', '440783', '开平市', '4407', 3); -INSERT INTO `dic_city` VALUES ('440784', '440784', '鹤山市', '4407', 3); -INSERT INTO `dic_city` VALUES ('440785', '440785', '恩平市', '4407', 3); -INSERT INTO `dic_city` VALUES ('4408', '4408', '湛江市', '44', 2); -INSERT INTO `dic_city` VALUES ('440802', '440802', '赤坎区', '4408', 3); -INSERT INTO `dic_city` VALUES ('440803', '440803', '霞山区', '4408', 3); -INSERT INTO `dic_city` VALUES ('440804', '440804', '坡头区', '4408', 3); -INSERT INTO `dic_city` VALUES ('440811', '440811', '麻章区', '4408', 3); -INSERT INTO `dic_city` VALUES ('440823', '440823', '遂溪县', '4408', 3); -INSERT INTO `dic_city` VALUES ('440825', '440825', '徐闻县', '4408', 3); -INSERT INTO `dic_city` VALUES ('440881', '440881', '廉江市', '4408', 3); -INSERT INTO `dic_city` VALUES ('440882', '440882', '雷州市', '4408', 3); -INSERT INTO `dic_city` VALUES ('440883', '440883', '吴川市', '4408', 3); -INSERT INTO `dic_city` VALUES ('4409', '4409', '茂名市', '44', 2); -INSERT INTO `dic_city` VALUES ('440902', '440902', '茂南区', '4409', 3); -INSERT INTO `dic_city` VALUES ('440904', '440904', '电白区', '4409', 3); -INSERT INTO `dic_city` VALUES ('440981', '440981', '高州市', '4409', 3); -INSERT INTO `dic_city` VALUES ('440982', '440982', '化州市', '4409', 3); -INSERT INTO `dic_city` VALUES ('440983', '440983', '信宜市', '4409', 3); -INSERT INTO `dic_city` VALUES ('4412', '4412', '肇庆市', '44', 2); -INSERT INTO `dic_city` VALUES ('441202', '441202', '端州区', '4412', 3); -INSERT INTO `dic_city` VALUES ('441203', '441203', '鼎湖区', '4412', 3); -INSERT INTO `dic_city` VALUES ('441204', '441204', '高要区', '4412', 3); -INSERT INTO `dic_city` VALUES ('441223', '441223', '广宁县', '4412', 3); -INSERT INTO `dic_city` VALUES ('441224', '441224', '怀集县', '4412', 3); -INSERT INTO `dic_city` VALUES ('441225', '441225', '封开县', '4412', 3); -INSERT INTO `dic_city` VALUES ('441226', '441226', '德庆县', '4412', 3); -INSERT INTO `dic_city` VALUES ('441284', '441284', '四会市', '4412', 3); -INSERT INTO `dic_city` VALUES ('4413', '4413', '惠州市', '44', 2); -INSERT INTO `dic_city` VALUES ('441302', '441302', '惠城区', '4413', 3); -INSERT INTO `dic_city` VALUES ('441303', '441303', '惠阳区', '4413', 3); -INSERT INTO `dic_city` VALUES ('441322', '441322', '博罗县', '4413', 3); -INSERT INTO `dic_city` VALUES ('441323', '441323', '惠东县', '4413', 3); -INSERT INTO `dic_city` VALUES ('441324', '441324', '龙门县', '4413', 3); -INSERT INTO `dic_city` VALUES ('4414', '4414', '梅州市', '44', 2); -INSERT INTO `dic_city` VALUES ('441402', '441402', '梅江区', '4414', 3); -INSERT INTO `dic_city` VALUES ('441403', '441403', '梅县区', '4414', 3); -INSERT INTO `dic_city` VALUES ('441422', '441422', '大埔县', '4414', 3); -INSERT INTO `dic_city` VALUES ('441423', '441423', '丰顺县', '4414', 3); -INSERT INTO `dic_city` VALUES ('441424', '441424', '五华县', '4414', 3); -INSERT INTO `dic_city` VALUES ('441426', '441426', '平远县', '4414', 3); -INSERT INTO `dic_city` VALUES ('441427', '441427', '蕉岭县', '4414', 3); -INSERT INTO `dic_city` VALUES ('441481', '441481', '兴宁市', '4414', 3); -INSERT INTO `dic_city` VALUES ('4415', '4415', '汕尾市', '44', 2); -INSERT INTO `dic_city` VALUES ('441502', '441502', '城区', '4415', 3); -INSERT INTO `dic_city` VALUES ('441521', '441521', '海丰县', '4415', 3); -INSERT INTO `dic_city` VALUES ('441523', '441523', '陆河县', '4415', 3); -INSERT INTO `dic_city` VALUES ('441581', '441581', '陆丰市', '4415', 3); -INSERT INTO `dic_city` VALUES ('4416', '4416', '河源市', '44', 2); -INSERT INTO `dic_city` VALUES ('441602', '441602', '源城区', '4416', 3); -INSERT INTO `dic_city` VALUES ('441621', '441621', '紫金县', '4416', 3); -INSERT INTO `dic_city` VALUES ('441622', '441622', '龙川县', '4416', 3); -INSERT INTO `dic_city` VALUES ('441623', '441623', '连平县', '4416', 3); -INSERT INTO `dic_city` VALUES ('441624', '441624', '和平县', '4416', 3); -INSERT INTO `dic_city` VALUES ('441625', '441625', '东源县', '4416', 3); -INSERT INTO `dic_city` VALUES ('4417', '4417', '阳江市', '44', 2); -INSERT INTO `dic_city` VALUES ('441702', '441702', '江城区', '4417', 3); -INSERT INTO `dic_city` VALUES ('441704', '441704', '阳东区', '4417', 3); -INSERT INTO `dic_city` VALUES ('441721', '441721', '阳西县', '4417', 3); -INSERT INTO `dic_city` VALUES ('441781', '441781', '阳春市', '4417', 3); -INSERT INTO `dic_city` VALUES ('4418', '4418', '清远市', '44', 2); -INSERT INTO `dic_city` VALUES ('441802', '441802', '清城区', '4418', 3); -INSERT INTO `dic_city` VALUES ('441803', '441803', '清新区', '4418', 3); -INSERT INTO `dic_city` VALUES ('441821', '441821', '佛冈县', '4418', 3); -INSERT INTO `dic_city` VALUES ('441823', '441823', '阳山县', '4418', 3); -INSERT INTO `dic_city` VALUES ('441825', '441825', '连山壮族瑶族自治县', '4418', 3); -INSERT INTO `dic_city` VALUES ('441826', '441826', '连南瑶族自治县', '4418', 3); -INSERT INTO `dic_city` VALUES ('441881', '441881', '英德市', '4418', 3); -INSERT INTO `dic_city` VALUES ('441882', '441882', '连州市', '4418', 3); -INSERT INTO `dic_city` VALUES ('4419', '4419', '东莞市', '44', 2); -INSERT INTO `dic_city` VALUES ('441900003', '441900003', '东城街道', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900004', '441900004', '南城街道', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900005', '441900005', '万江街道', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900006', '441900006', '莞城街道', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900101', '441900101', '石碣镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900102', '441900102', '石龙镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900103', '441900103', '茶山镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900104', '441900104', '石排镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900105', '441900105', '企石镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900106', '441900106', '横沥镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900107', '441900107', '桥头镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900108', '441900108', '谢岗镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900109', '441900109', '东坑镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900110', '441900110', '常平镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900111', '441900111', '寮步镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900112', '441900112', '樟木头镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900113', '441900113', '大朗镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900114', '441900114', '黄江镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900115', '441900115', '清溪镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900116', '441900116', '塘厦镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900117', '441900117', '凤岗镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900118', '441900118', '大岭山镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900119', '441900119', '长安镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900121', '441900121', '虎门镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900122', '441900122', '厚街镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900123', '441900123', '沙田镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900124', '441900124', '道滘镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900125', '441900125', '洪梅镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900126', '441900126', '麻涌镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900127', '441900127', '望牛墩镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900128', '441900128', '中堂镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900129', '441900129', '高埗镇', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900401', '441900401', '松山湖', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900402', '441900402', '东莞港', '4419', 3); -INSERT INTO `dic_city` VALUES ('441900403', '441900403', '东莞生态园', '4419', 3); -INSERT INTO `dic_city` VALUES ('4420', '4420', '中山市', '44', 2); -INSERT INTO `dic_city` VALUES ('442000001', '442000001', '石岐街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000002', '442000002', '东区街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000003', '442000003', '中山港街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000004', '442000004', '西区街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000005', '442000005', '南区街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000006', '442000006', '五桂山街道', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000100', '442000100', '小榄镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000101', '442000101', '黄圃镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000102', '442000102', '民众镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000103', '442000103', '东凤镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000104', '442000104', '东升镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000105', '442000105', '古镇镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000106', '442000106', '沙溪镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000107', '442000107', '坦洲镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000108', '442000108', '港口镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000109', '442000109', '三角镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000110', '442000110', '横栏镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000111', '442000111', '南头镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000112', '442000112', '阜沙镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000113', '442000113', '南朗镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000114', '442000114', '三乡镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000115', '442000115', '板芙镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000116', '442000116', '大涌镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('442000117', '442000117', '神湾镇', '4420', 3); -INSERT INTO `dic_city` VALUES ('4451', '4451', '潮州市', '44', 2); -INSERT INTO `dic_city` VALUES ('445102', '445102', '湘桥区', '4451', 3); -INSERT INTO `dic_city` VALUES ('445103', '445103', '潮安区', '4451', 3); -INSERT INTO `dic_city` VALUES ('445122', '445122', '饶平县', '4451', 3); -INSERT INTO `dic_city` VALUES ('4452', '4452', '揭阳市', '44', 2); -INSERT INTO `dic_city` VALUES ('445202', '445202', '榕城区', '4452', 3); -INSERT INTO `dic_city` VALUES ('445203', '445203', '揭东区', '4452', 3); -INSERT INTO `dic_city` VALUES ('445222', '445222', '揭西县', '4452', 3); -INSERT INTO `dic_city` VALUES ('445224', '445224', '惠来县', '4452', 3); -INSERT INTO `dic_city` VALUES ('445281', '445281', '普宁市', '4452', 3); -INSERT INTO `dic_city` VALUES ('4453', '4453', '云浮市', '44', 2); -INSERT INTO `dic_city` VALUES ('445302', '445302', '云城区', '4453', 3); -INSERT INTO `dic_city` VALUES ('445303', '445303', '云安区', '4453', 3); -INSERT INTO `dic_city` VALUES ('445321', '445321', '新兴县', '4453', 3); -INSERT INTO `dic_city` VALUES ('445322', '445322', '郁南县', '4453', 3); -INSERT INTO `dic_city` VALUES ('445381', '445381', '罗定市', '4453', 3); -INSERT INTO `dic_city` VALUES ('45', '45', '广西壮族自治区', NULL, 1); -INSERT INTO `dic_city` VALUES ('4501', '4501', '南宁市', '45', 2); -INSERT INTO `dic_city` VALUES ('450102', '450102', '兴宁区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450103', '450103', '青秀区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450105', '450105', '江南区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450107', '450107', '西乡塘区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450108', '450108', '良庆区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450109', '450109', '邕宁区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450110', '450110', '武鸣区', '4501', 3); -INSERT INTO `dic_city` VALUES ('450123', '450123', '隆安县', '4501', 3); -INSERT INTO `dic_city` VALUES ('450124', '450124', '马山县', '4501', 3); -INSERT INTO `dic_city` VALUES ('450125', '450125', '上林县', '4501', 3); -INSERT INTO `dic_city` VALUES ('450126', '450126', '宾阳县', '4501', 3); -INSERT INTO `dic_city` VALUES ('450127', '450127', '横县', '4501', 3); -INSERT INTO `dic_city` VALUES ('4502', '4502', '柳州市', '45', 2); -INSERT INTO `dic_city` VALUES ('450202', '450202', '城中区', '4502', 3); -INSERT INTO `dic_city` VALUES ('450203', '450203', '鱼峰区', '4502', 3); -INSERT INTO `dic_city` VALUES ('450204', '450204', '柳南区', '4502', 3); -INSERT INTO `dic_city` VALUES ('450205', '450205', '柳北区', '4502', 3); -INSERT INTO `dic_city` VALUES ('450206', '450206', '柳江区', '4502', 3); -INSERT INTO `dic_city` VALUES ('450222', '450222', '柳城县', '4502', 3); -INSERT INTO `dic_city` VALUES ('450223', '450223', '鹿寨县', '4502', 3); -INSERT INTO `dic_city` VALUES ('450224', '450224', '融安县', '4502', 3); -INSERT INTO `dic_city` VALUES ('450225', '450225', '融水苗族自治县', '4502', 3); -INSERT INTO `dic_city` VALUES ('450226', '450226', '三江侗族自治县', '4502', 3); -INSERT INTO `dic_city` VALUES ('4503', '4503', '桂林市', '45', 2); -INSERT INTO `dic_city` VALUES ('450302', '450302', '秀峰区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450303', '450303', '叠彩区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450304', '450304', '象山区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450305', '450305', '七星区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450311', '450311', '雁山区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450312', '450312', '临桂区', '4503', 3); -INSERT INTO `dic_city` VALUES ('450321', '450321', '阳朔县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450323', '450323', '灵川县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450324', '450324', '全州县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450325', '450325', '兴安县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450326', '450326', '永福县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450327', '450327', '灌阳县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450328', '450328', '龙胜各族自治县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450329', '450329', '资源县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450330', '450330', '平乐县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450332', '450332', '恭城瑶族自治县', '4503', 3); -INSERT INTO `dic_city` VALUES ('450381', '450381', '荔浦市', '4503', 3); -INSERT INTO `dic_city` VALUES ('4504', '4504', '梧州市', '45', 2); -INSERT INTO `dic_city` VALUES ('450403', '450403', '万秀区', '4504', 3); -INSERT INTO `dic_city` VALUES ('450405', '450405', '长洲区', '4504', 3); -INSERT INTO `dic_city` VALUES ('450406', '450406', '龙圩区', '4504', 3); -INSERT INTO `dic_city` VALUES ('450421', '450421', '苍梧县', '4504', 3); -INSERT INTO `dic_city` VALUES ('450422', '450422', '藤县', '4504', 3); -INSERT INTO `dic_city` VALUES ('450423', '450423', '蒙山县', '4504', 3); -INSERT INTO `dic_city` VALUES ('450481', '450481', '岑溪市', '4504', 3); -INSERT INTO `dic_city` VALUES ('4505', '4505', '北海市', '45', 2); -INSERT INTO `dic_city` VALUES ('450502', '450502', '海城区', '4505', 3); -INSERT INTO `dic_city` VALUES ('450503', '450503', '银海区', '4505', 3); -INSERT INTO `dic_city` VALUES ('450512', '450512', '铁山港区', '4505', 3); -INSERT INTO `dic_city` VALUES ('450521', '450521', '合浦县', '4505', 3); -INSERT INTO `dic_city` VALUES ('4506', '4506', '防城港市', '45', 2); -INSERT INTO `dic_city` VALUES ('450602', '450602', '港口区', '4506', 3); -INSERT INTO `dic_city` VALUES ('450603', '450603', '防城区', '4506', 3); -INSERT INTO `dic_city` VALUES ('450621', '450621', '上思县', '4506', 3); -INSERT INTO `dic_city` VALUES ('450681', '450681', '东兴市', '4506', 3); -INSERT INTO `dic_city` VALUES ('4507', '4507', '钦州市', '45', 2); -INSERT INTO `dic_city` VALUES ('450702', '450702', '钦南区', '4507', 3); -INSERT INTO `dic_city` VALUES ('450703', '450703', '钦北区', '4507', 3); -INSERT INTO `dic_city` VALUES ('450721', '450721', '灵山县', '4507', 3); -INSERT INTO `dic_city` VALUES ('450722', '450722', '浦北县', '4507', 3); -INSERT INTO `dic_city` VALUES ('4508', '4508', '贵港市', '45', 2); -INSERT INTO `dic_city` VALUES ('450802', '450802', '港北区', '4508', 3); -INSERT INTO `dic_city` VALUES ('450803', '450803', '港南区', '4508', 3); -INSERT INTO `dic_city` VALUES ('450804', '450804', '覃塘区', '4508', 3); -INSERT INTO `dic_city` VALUES ('450821', '450821', '平南县', '4508', 3); -INSERT INTO `dic_city` VALUES ('450881', '450881', '桂平市', '4508', 3); -INSERT INTO `dic_city` VALUES ('4509', '4509', '玉林市', '45', 2); -INSERT INTO `dic_city` VALUES ('450902', '450902', '玉州区', '4509', 3); -INSERT INTO `dic_city` VALUES ('450903', '450903', '福绵区', '4509', 3); -INSERT INTO `dic_city` VALUES ('450921', '450921', '容县', '4509', 3); -INSERT INTO `dic_city` VALUES ('450922', '450922', '陆川县', '4509', 3); -INSERT INTO `dic_city` VALUES ('450923', '450923', '博白县', '4509', 3); -INSERT INTO `dic_city` VALUES ('450924', '450924', '兴业县', '4509', 3); -INSERT INTO `dic_city` VALUES ('450981', '450981', '北流市', '4509', 3); -INSERT INTO `dic_city` VALUES ('4510', '4510', '百色市', '45', 2); -INSERT INTO `dic_city` VALUES ('451002', '451002', '右江区', '4510', 3); -INSERT INTO `dic_city` VALUES ('451003', '451003', '田阳区', '4510', 3); -INSERT INTO `dic_city` VALUES ('451022', '451022', '田东县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451024', '451024', '德保县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451026', '451026', '那坡县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451027', '451027', '凌云县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451028', '451028', '乐业县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451029', '451029', '田林县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451030', '451030', '西林县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451031', '451031', '隆林各族自治县', '4510', 3); -INSERT INTO `dic_city` VALUES ('451081', '451081', '靖西市', '4510', 3); -INSERT INTO `dic_city` VALUES ('451082', '451082', '平果市', '4510', 3); -INSERT INTO `dic_city` VALUES ('4511', '4511', '贺州市', '45', 2); -INSERT INTO `dic_city` VALUES ('451102', '451102', '八步区', '4511', 3); -INSERT INTO `dic_city` VALUES ('451103', '451103', '平桂区', '4511', 3); -INSERT INTO `dic_city` VALUES ('451121', '451121', '昭平县', '4511', 3); -INSERT INTO `dic_city` VALUES ('451122', '451122', '钟山县', '4511', 3); -INSERT INTO `dic_city` VALUES ('451123', '451123', '富川瑶族自治县', '4511', 3); -INSERT INTO `dic_city` VALUES ('4512', '4512', '河池市', '45', 2); -INSERT INTO `dic_city` VALUES ('451202', '451202', '金城江区', '4512', 3); -INSERT INTO `dic_city` VALUES ('451203', '451203', '宜州区', '4512', 3); -INSERT INTO `dic_city` VALUES ('451221', '451221', '南丹县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451222', '451222', '天峨县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451223', '451223', '凤山县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451224', '451224', '东兰县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451225', '451225', '罗城仫佬族自治县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451226', '451226', '环江毛南族自治县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451227', '451227', '巴马瑶族自治县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451228', '451228', '都安瑶族自治县', '4512', 3); -INSERT INTO `dic_city` VALUES ('451229', '451229', '大化瑶族自治县', '4512', 3); -INSERT INTO `dic_city` VALUES ('4513', '4513', '来宾市', '45', 2); -INSERT INTO `dic_city` VALUES ('451302', '451302', '兴宾区', '4513', 3); -INSERT INTO `dic_city` VALUES ('451321', '451321', '忻城县', '4513', 3); -INSERT INTO `dic_city` VALUES ('451322', '451322', '象州县', '4513', 3); -INSERT INTO `dic_city` VALUES ('451323', '451323', '武宣县', '4513', 3); -INSERT INTO `dic_city` VALUES ('451324', '451324', '金秀瑶族自治县', '4513', 3); -INSERT INTO `dic_city` VALUES ('451381', '451381', '合山市', '4513', 3); -INSERT INTO `dic_city` VALUES ('4514', '4514', '崇左市', '45', 2); -INSERT INTO `dic_city` VALUES ('451402', '451402', '江州区', '4514', 3); -INSERT INTO `dic_city` VALUES ('451421', '451421', '扶绥县', '4514', 3); -INSERT INTO `dic_city` VALUES ('451422', '451422', '宁明县', '4514', 3); -INSERT INTO `dic_city` VALUES ('451423', '451423', '龙州县', '4514', 3); -INSERT INTO `dic_city` VALUES ('451424', '451424', '大新县', '4514', 3); -INSERT INTO `dic_city` VALUES ('451425', '451425', '天等县', '4514', 3); -INSERT INTO `dic_city` VALUES ('451481', '451481', '凭祥市', '4514', 3); -INSERT INTO `dic_city` VALUES ('46', '46', '海南省', NULL, 1); -INSERT INTO `dic_city` VALUES ('4601', '4601', '海口市', '46', 2); -INSERT INTO `dic_city` VALUES ('460105', '460105', '秀英区', '4601', 3); -INSERT INTO `dic_city` VALUES ('460106', '460106', '龙华区', '4601', 3); -INSERT INTO `dic_city` VALUES ('460107', '460107', '琼山区', '4601', 3); -INSERT INTO `dic_city` VALUES ('460108', '460108', '美兰区', '4601', 3); -INSERT INTO `dic_city` VALUES ('4602', '4602', '三亚市', '46', 2); -INSERT INTO `dic_city` VALUES ('460202', '460202', '海棠区', '4602', 3); -INSERT INTO `dic_city` VALUES ('460203', '460203', '吉阳区', '4602', 3); -INSERT INTO `dic_city` VALUES ('460204', '460204', '天涯区', '4602', 3); -INSERT INTO `dic_city` VALUES ('460205', '460205', '崖州区', '4602', 3); -INSERT INTO `dic_city` VALUES ('4603', '4603', '三沙市', '46', 2); -INSERT INTO `dic_city` VALUES ('460321', '460321', '西沙群岛', '4603', 3); -INSERT INTO `dic_city` VALUES ('460322', '460322', '南沙群岛', '4603', 3); -INSERT INTO `dic_city` VALUES ('460323', '460323', '中沙群岛的岛礁及其海域', '4603', 3); -INSERT INTO `dic_city` VALUES ('4604', '4604', '儋州市', '46', 2); -INSERT INTO `dic_city` VALUES ('460400100', '460400100', '那大镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400101', '460400101', '和庆镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400102', '460400102', '南丰镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400103', '460400103', '大成镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400104', '460400104', '雅星镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400105', '460400105', '兰洋镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400106', '460400106', '光村镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400107', '460400107', '木棠镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400108', '460400108', '海头镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400109', '460400109', '峨蔓镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400111', '460400111', '王五镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400112', '460400112', '白马井镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400113', '460400113', '中和镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400114', '460400114', '排浦镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400115', '460400115', '东成镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400116', '460400116', '新州镇', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400499', '460400499', '洋浦经济开发区', '4604', 3); -INSERT INTO `dic_city` VALUES ('460400500', '460400500', '华南热作学院', '4604', 3); -INSERT INTO `dic_city` VALUES ('4690', '4690', '省直辖县级行政区划', '46', 2); -INSERT INTO `dic_city` VALUES ('469001', '469001', '五指山市', '4690', 3); -INSERT INTO `dic_city` VALUES ('469002', '469002', '琼海市', '4690', 3); -INSERT INTO `dic_city` VALUES ('469005', '469005', '文昌市', '4690', 3); -INSERT INTO `dic_city` VALUES ('469006', '469006', '万宁市', '4690', 3); -INSERT INTO `dic_city` VALUES ('469007', '469007', '东方市', '4690', 3); -INSERT INTO `dic_city` VALUES ('469021', '469021', '定安县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469022', '469022', '屯昌县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469023', '469023', '澄迈县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469024', '469024', '临高县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469025', '469025', '白沙黎族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469026', '469026', '昌江黎族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469027', '469027', '乐东黎族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469028', '469028', '陵水黎族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469029', '469029', '保亭黎族苗族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('469030', '469030', '琼中黎族苗族自治县', '4690', 3); -INSERT INTO `dic_city` VALUES ('50', '50', '重庆市', NULL, 1); -INSERT INTO `dic_city` VALUES ('5001', '5001', '市辖区', '50', 2); -INSERT INTO `dic_city` VALUES ('500101', '500101', '万州区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500102', '500102', '涪陵区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500103', '500103', '渝中区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500104', '500104', '大渡口区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500105', '500105', '江北区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500106', '500106', '沙坪坝区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500107', '500107', '九龙坡区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500108', '500108', '南岸区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500109', '500109', '北碚区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500110', '500110', '綦江区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500111', '500111', '大足区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500112', '500112', '渝北区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500113', '500113', '巴南区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500114', '500114', '黔江区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500115', '500115', '长寿区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500116', '500116', '江津区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500117', '500117', '合川区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500118', '500118', '永川区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500119', '500119', '南川区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500120', '500120', '璧山区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500151', '500151', '铜梁区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500152', '500152', '潼南区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500153', '500153', '荣昌区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500154', '500154', '开州区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500155', '500155', '梁平区', '5001', 3); -INSERT INTO `dic_city` VALUES ('500156', '500156', '武隆区', '5001', 3); -INSERT INTO `dic_city` VALUES ('5002', '5002', '县', '50', 2); -INSERT INTO `dic_city` VALUES ('500229', '500229', '城口县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500230', '500230', '丰都县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500231', '500231', '垫江县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500233', '500233', '忠县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500235', '500235', '云阳县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500236', '500236', '奉节县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500237', '500237', '巫山县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500238', '500238', '巫溪县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500240', '500240', '石柱土家族自治县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500241', '500241', '秀山土家族苗族自治县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500242', '500242', '酉阳土家族苗族自治县', '5002', 3); -INSERT INTO `dic_city` VALUES ('500243', '500243', '彭水苗族土家族自治县', '5002', 3); -INSERT INTO `dic_city` VALUES ('51', '51', '四川省', NULL, 1); -INSERT INTO `dic_city` VALUES ('5101', '5101', '成都市', '51', 2); -INSERT INTO `dic_city` VALUES ('510104', '510104', '锦江区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510105', '510105', '青羊区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510106', '510106', '金牛区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510107', '510107', '武侯区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510108', '510108', '成华区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510112', '510112', '龙泉驿区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510113', '510113', '青白江区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510114', '510114', '新都区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510115', '510115', '温江区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510116', '510116', '双流区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510117', '510117', '郫都区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510118', '510118', '新津区', '5101', 3); -INSERT INTO `dic_city` VALUES ('510121', '510121', '金堂县', '5101', 3); -INSERT INTO `dic_city` VALUES ('510129', '510129', '大邑县', '5101', 3); -INSERT INTO `dic_city` VALUES ('510131', '510131', '蒲江县', '5101', 3); -INSERT INTO `dic_city` VALUES ('510181', '510181', '都江堰市', '5101', 3); -INSERT INTO `dic_city` VALUES ('510182', '510182', '彭州市', '5101', 3); -INSERT INTO `dic_city` VALUES ('510183', '510183', '邛崃市', '5101', 3); -INSERT INTO `dic_city` VALUES ('510184', '510184', '崇州市', '5101', 3); -INSERT INTO `dic_city` VALUES ('510185', '510185', '简阳市', '5101', 3); -INSERT INTO `dic_city` VALUES ('5103', '5103', '自贡市', '51', 2); -INSERT INTO `dic_city` VALUES ('510302', '510302', '自流井区', '5103', 3); -INSERT INTO `dic_city` VALUES ('510303', '510303', '贡井区', '5103', 3); -INSERT INTO `dic_city` VALUES ('510304', '510304', '大安区', '5103', 3); -INSERT INTO `dic_city` VALUES ('510311', '510311', '沿滩区', '5103', 3); -INSERT INTO `dic_city` VALUES ('510321', '510321', '荣县', '5103', 3); -INSERT INTO `dic_city` VALUES ('510322', '510322', '富顺县', '5103', 3); -INSERT INTO `dic_city` VALUES ('5104', '5104', '攀枝花市', '51', 2); -INSERT INTO `dic_city` VALUES ('510402', '510402', '东区', '5104', 3); -INSERT INTO `dic_city` VALUES ('510403', '510403', '西区', '5104', 3); -INSERT INTO `dic_city` VALUES ('510411', '510411', '仁和区', '5104', 3); -INSERT INTO `dic_city` VALUES ('510421', '510421', '米易县', '5104', 3); -INSERT INTO `dic_city` VALUES ('510422', '510422', '盐边县', '5104', 3); -INSERT INTO `dic_city` VALUES ('5105', '5105', '泸州市', '51', 2); -INSERT INTO `dic_city` VALUES ('510502', '510502', '江阳区', '5105', 3); -INSERT INTO `dic_city` VALUES ('510503', '510503', '纳溪区', '5105', 3); -INSERT INTO `dic_city` VALUES ('510504', '510504', '龙马潭区', '5105', 3); -INSERT INTO `dic_city` VALUES ('510521', '510521', '泸县', '5105', 3); -INSERT INTO `dic_city` VALUES ('510522', '510522', '合江县', '5105', 3); -INSERT INTO `dic_city` VALUES ('510524', '510524', '叙永县', '5105', 3); -INSERT INTO `dic_city` VALUES ('510525', '510525', '古蔺县', '5105', 3); -INSERT INTO `dic_city` VALUES ('5106', '5106', '德阳市', '51', 2); -INSERT INTO `dic_city` VALUES ('510603', '510603', '旌阳区', '5106', 3); -INSERT INTO `dic_city` VALUES ('510604', '510604', '罗江区', '5106', 3); -INSERT INTO `dic_city` VALUES ('510623', '510623', '中江县', '5106', 3); -INSERT INTO `dic_city` VALUES ('510681', '510681', '广汉市', '5106', 3); -INSERT INTO `dic_city` VALUES ('510682', '510682', '什邡市', '5106', 3); -INSERT INTO `dic_city` VALUES ('510683', '510683', '绵竹市', '5106', 3); -INSERT INTO `dic_city` VALUES ('5107', '5107', '绵阳市', '51', 2); -INSERT INTO `dic_city` VALUES ('510703', '510703', '涪城区', '5107', 3); -INSERT INTO `dic_city` VALUES ('510704', '510704', '游仙区', '5107', 3); -INSERT INTO `dic_city` VALUES ('510705', '510705', '安州区', '5107', 3); -INSERT INTO `dic_city` VALUES ('510722', '510722', '三台县', '5107', 3); -INSERT INTO `dic_city` VALUES ('510723', '510723', '盐亭县', '5107', 3); -INSERT INTO `dic_city` VALUES ('510725', '510725', '梓潼县', '5107', 3); -INSERT INTO `dic_city` VALUES ('510726', '510726', '北川羌族自治县', '5107', 3); -INSERT INTO `dic_city` VALUES ('510727', '510727', '平武县', '5107', 3); -INSERT INTO `dic_city` VALUES ('510781', '510781', '江油市', '5107', 3); -INSERT INTO `dic_city` VALUES ('5108', '5108', '广元市', '51', 2); -INSERT INTO `dic_city` VALUES ('510802', '510802', '利州区', '5108', 3); -INSERT INTO `dic_city` VALUES ('510811', '510811', '昭化区', '5108', 3); -INSERT INTO `dic_city` VALUES ('510812', '510812', '朝天区', '5108', 3); -INSERT INTO `dic_city` VALUES ('510821', '510821', '旺苍县', '5108', 3); -INSERT INTO `dic_city` VALUES ('510822', '510822', '青川县', '5108', 3); -INSERT INTO `dic_city` VALUES ('510823', '510823', '剑阁县', '5108', 3); -INSERT INTO `dic_city` VALUES ('510824', '510824', '苍溪县', '5108', 3); -INSERT INTO `dic_city` VALUES ('5109', '5109', '遂宁市', '51', 2); -INSERT INTO `dic_city` VALUES ('510903', '510903', '船山区', '5109', 3); -INSERT INTO `dic_city` VALUES ('510904', '510904', '安居区', '5109', 3); -INSERT INTO `dic_city` VALUES ('510921', '510921', '蓬溪县', '5109', 3); -INSERT INTO `dic_city` VALUES ('510923', '510923', '大英县', '5109', 3); -INSERT INTO `dic_city` VALUES ('510981', '510981', '射洪市', '5109', 3); -INSERT INTO `dic_city` VALUES ('5110', '5110', '内江市', '51', 2); -INSERT INTO `dic_city` VALUES ('511002', '511002', '市中区', '5110', 3); -INSERT INTO `dic_city` VALUES ('511011', '511011', '东兴区', '5110', 3); -INSERT INTO `dic_city` VALUES ('511024', '511024', '威远县', '5110', 3); -INSERT INTO `dic_city` VALUES ('511025', '511025', '资中县', '5110', 3); -INSERT INTO `dic_city` VALUES ('511071', '511071', '内江经济开发区', '5110', 3); -INSERT INTO `dic_city` VALUES ('511083', '511083', '隆昌市', '5110', 3); -INSERT INTO `dic_city` VALUES ('5111', '5111', '乐山市', '51', 2); -INSERT INTO `dic_city` VALUES ('511102', '511102', '市中区', '5111', 3); -INSERT INTO `dic_city` VALUES ('511111', '511111', '沙湾区', '5111', 3); -INSERT INTO `dic_city` VALUES ('511112', '511112', '五通桥区', '5111', 3); -INSERT INTO `dic_city` VALUES ('511113', '511113', '金口河区', '5111', 3); -INSERT INTO `dic_city` VALUES ('511123', '511123', '犍为县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511124', '511124', '井研县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511126', '511126', '夹江县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511129', '511129', '沐川县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511132', '511132', '峨边彝族自治县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511133', '511133', '马边彝族自治县', '5111', 3); -INSERT INTO `dic_city` VALUES ('511181', '511181', '峨眉山市', '5111', 3); -INSERT INTO `dic_city` VALUES ('5113', '5113', '南充市', '51', 2); -INSERT INTO `dic_city` VALUES ('511302', '511302', '顺庆区', '5113', 3); -INSERT INTO `dic_city` VALUES ('511303', '511303', '高坪区', '5113', 3); -INSERT INTO `dic_city` VALUES ('511304', '511304', '嘉陵区', '5113', 3); -INSERT INTO `dic_city` VALUES ('511321', '511321', '南部县', '5113', 3); -INSERT INTO `dic_city` VALUES ('511322', '511322', '营山县', '5113', 3); -INSERT INTO `dic_city` VALUES ('511323', '511323', '蓬安县', '5113', 3); -INSERT INTO `dic_city` VALUES ('511324', '511324', '仪陇县', '5113', 3); -INSERT INTO `dic_city` VALUES ('511325', '511325', '西充县', '5113', 3); -INSERT INTO `dic_city` VALUES ('511381', '511381', '阆中市', '5113', 3); -INSERT INTO `dic_city` VALUES ('5114', '5114', '眉山市', '51', 2); -INSERT INTO `dic_city` VALUES ('511402', '511402', '东坡区', '5114', 3); -INSERT INTO `dic_city` VALUES ('511403', '511403', '彭山区', '5114', 3); -INSERT INTO `dic_city` VALUES ('511421', '511421', '仁寿县', '5114', 3); -INSERT INTO `dic_city` VALUES ('511423', '511423', '洪雅县', '5114', 3); -INSERT INTO `dic_city` VALUES ('511424', '511424', '丹棱县', '5114', 3); -INSERT INTO `dic_city` VALUES ('511425', '511425', '青神县', '5114', 3); -INSERT INTO `dic_city` VALUES ('5115', '5115', '宜宾市', '51', 2); -INSERT INTO `dic_city` VALUES ('511502', '511502', '翠屏区', '5115', 3); -INSERT INTO `dic_city` VALUES ('511503', '511503', '南溪区', '5115', 3); -INSERT INTO `dic_city` VALUES ('511504', '511504', '叙州区', '5115', 3); -INSERT INTO `dic_city` VALUES ('511523', '511523', '江安县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511524', '511524', '长宁县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511525', '511525', '高县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511526', '511526', '珙县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511527', '511527', '筠连县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511528', '511528', '兴文县', '5115', 3); -INSERT INTO `dic_city` VALUES ('511529', '511529', '屏山县', '5115', 3); -INSERT INTO `dic_city` VALUES ('5116', '5116', '广安市', '51', 2); -INSERT INTO `dic_city` VALUES ('511602', '511602', '广安区', '5116', 3); -INSERT INTO `dic_city` VALUES ('511603', '511603', '前锋区', '5116', 3); -INSERT INTO `dic_city` VALUES ('511621', '511621', '岳池县', '5116', 3); -INSERT INTO `dic_city` VALUES ('511622', '511622', '武胜县', '5116', 3); -INSERT INTO `dic_city` VALUES ('511623', '511623', '邻水县', '5116', 3); -INSERT INTO `dic_city` VALUES ('511681', '511681', '华蓥市', '5116', 3); -INSERT INTO `dic_city` VALUES ('5117', '5117', '达州市', '51', 2); -INSERT INTO `dic_city` VALUES ('511702', '511702', '通川区', '5117', 3); -INSERT INTO `dic_city` VALUES ('511703', '511703', '达川区', '5117', 3); -INSERT INTO `dic_city` VALUES ('511722', '511722', '宣汉县', '5117', 3); -INSERT INTO `dic_city` VALUES ('511723', '511723', '开江县', '5117', 3); -INSERT INTO `dic_city` VALUES ('511724', '511724', '大竹县', '5117', 3); -INSERT INTO `dic_city` VALUES ('511725', '511725', '渠县', '5117', 3); -INSERT INTO `dic_city` VALUES ('511771', '511771', '达州经济开发区', '5117', 3); -INSERT INTO `dic_city` VALUES ('511781', '511781', '万源市', '5117', 3); -INSERT INTO `dic_city` VALUES ('5118', '5118', '雅安市', '51', 2); -INSERT INTO `dic_city` VALUES ('511802', '511802', '雨城区', '5118', 3); -INSERT INTO `dic_city` VALUES ('511803', '511803', '名山区', '5118', 3); -INSERT INTO `dic_city` VALUES ('511822', '511822', '荥经县', '5118', 3); -INSERT INTO `dic_city` VALUES ('511823', '511823', '汉源县', '5118', 3); -INSERT INTO `dic_city` VALUES ('511824', '511824', '石棉县', '5118', 3); -INSERT INTO `dic_city` VALUES ('511825', '511825', '天全县', '5118', 3); -INSERT INTO `dic_city` VALUES ('511826', '511826', '芦山县', '5118', 3); -INSERT INTO `dic_city` VALUES ('511827', '511827', '宝兴县', '5118', 3); -INSERT INTO `dic_city` VALUES ('5119', '5119', '巴中市', '51', 2); -INSERT INTO `dic_city` VALUES ('511902', '511902', '巴州区', '5119', 3); -INSERT INTO `dic_city` VALUES ('511903', '511903', '恩阳区', '5119', 3); -INSERT INTO `dic_city` VALUES ('511921', '511921', '通江县', '5119', 3); -INSERT INTO `dic_city` VALUES ('511922', '511922', '南江县', '5119', 3); -INSERT INTO `dic_city` VALUES ('511923', '511923', '平昌县', '5119', 3); -INSERT INTO `dic_city` VALUES ('511971', '511971', '巴中经济开发区', '5119', 3); -INSERT INTO `dic_city` VALUES ('5120', '5120', '资阳市', '51', 2); -INSERT INTO `dic_city` VALUES ('512002', '512002', '雁江区', '5120', 3); -INSERT INTO `dic_city` VALUES ('512021', '512021', '安岳县', '5120', 3); -INSERT INTO `dic_city` VALUES ('512022', '512022', '乐至县', '5120', 3); -INSERT INTO `dic_city` VALUES ('5132', '5132', '阿坝藏族羌族自治州', '51', 2); -INSERT INTO `dic_city` VALUES ('513201', '513201', '马尔康市', '5132', 3); -INSERT INTO `dic_city` VALUES ('513221', '513221', '汶川县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513222', '513222', '理县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513223', '513223', '茂县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513224', '513224', '松潘县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513225', '513225', '九寨沟县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513226', '513226', '金川县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513227', '513227', '小金县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513228', '513228', '黑水县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513230', '513230', '壤塘县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513231', '513231', '阿坝县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513232', '513232', '若尔盖县', '5132', 3); -INSERT INTO `dic_city` VALUES ('513233', '513233', '红原县', '5132', 3); -INSERT INTO `dic_city` VALUES ('5133', '5133', '甘孜藏族自治州', '51', 2); -INSERT INTO `dic_city` VALUES ('513301', '513301', '康定市', '5133', 3); -INSERT INTO `dic_city` VALUES ('513322', '513322', '泸定县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513323', '513323', '丹巴县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513324', '513324', '九龙县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513325', '513325', '雅江县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513326', '513326', '道孚县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513327', '513327', '炉霍县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513328', '513328', '甘孜县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513329', '513329', '新龙县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513330', '513330', '德格县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513331', '513331', '白玉县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513332', '513332', '石渠县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513333', '513333', '色达县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513334', '513334', '理塘县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513335', '513335', '巴塘县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513336', '513336', '乡城县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513337', '513337', '稻城县', '5133', 3); -INSERT INTO `dic_city` VALUES ('513338', '513338', '得荣县', '5133', 3); -INSERT INTO `dic_city` VALUES ('5134', '5134', '凉山彝族自治州', '51', 2); -INSERT INTO `dic_city` VALUES ('513401', '513401', '西昌市', '5134', 3); -INSERT INTO `dic_city` VALUES ('513422', '513422', '木里藏族自治县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513423', '513423', '盐源县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513424', '513424', '德昌县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513425', '513425', '会理县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513426', '513426', '会东县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513427', '513427', '宁南县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513428', '513428', '普格县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513429', '513429', '布拖县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513430', '513430', '金阳县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513431', '513431', '昭觉县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513432', '513432', '喜德县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513433', '513433', '冕宁县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513434', '513434', '越西县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513435', '513435', '甘洛县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513436', '513436', '美姑县', '5134', 3); -INSERT INTO `dic_city` VALUES ('513437', '513437', '雷波县', '5134', 3); -INSERT INTO `dic_city` VALUES ('52', '52', '贵州省', NULL, 1); -INSERT INTO `dic_city` VALUES ('5201', '5201', '贵阳市', '52', 2); -INSERT INTO `dic_city` VALUES ('520102', '520102', '南明区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520103', '520103', '云岩区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520111', '520111', '花溪区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520112', '520112', '乌当区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520113', '520113', '白云区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520115', '520115', '观山湖区', '5201', 3); -INSERT INTO `dic_city` VALUES ('520121', '520121', '开阳县', '5201', 3); -INSERT INTO `dic_city` VALUES ('520122', '520122', '息烽县', '5201', 3); -INSERT INTO `dic_city` VALUES ('520123', '520123', '修文县', '5201', 3); -INSERT INTO `dic_city` VALUES ('520181', '520181', '清镇市', '5201', 3); -INSERT INTO `dic_city` VALUES ('5202', '5202', '六盘水市', '52', 2); -INSERT INTO `dic_city` VALUES ('520201', '520201', '钟山区', '5202', 3); -INSERT INTO `dic_city` VALUES ('520203', '520203', '六枝特区', '5202', 3); -INSERT INTO `dic_city` VALUES ('520221', '520221', '水城县', '5202', 3); -INSERT INTO `dic_city` VALUES ('520281', '520281', '盘州市', '5202', 3); -INSERT INTO `dic_city` VALUES ('5203', '5203', '遵义市', '52', 2); -INSERT INTO `dic_city` VALUES ('520302', '520302', '红花岗区', '5203', 3); -INSERT INTO `dic_city` VALUES ('520303', '520303', '汇川区', '5203', 3); -INSERT INTO `dic_city` VALUES ('520304', '520304', '播州区', '5203', 3); -INSERT INTO `dic_city` VALUES ('520322', '520322', '桐梓县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520323', '520323', '绥阳县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520324', '520324', '正安县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520325', '520325', '道真仡佬族苗族自治县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520326', '520326', '务川仡佬族苗族自治县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520327', '520327', '凤冈县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520328', '520328', '湄潭县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520329', '520329', '余庆县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520330', '520330', '习水县', '5203', 3); -INSERT INTO `dic_city` VALUES ('520381', '520381', '赤水市', '5203', 3); -INSERT INTO `dic_city` VALUES ('520382', '520382', '仁怀市', '5203', 3); -INSERT INTO `dic_city` VALUES ('5204', '5204', '安顺市', '52', 2); -INSERT INTO `dic_city` VALUES ('520402', '520402', '西秀区', '5204', 3); -INSERT INTO `dic_city` VALUES ('520403', '520403', '平坝区', '5204', 3); -INSERT INTO `dic_city` VALUES ('520422', '520422', '普定县', '5204', 3); -INSERT INTO `dic_city` VALUES ('520423', '520423', '镇宁布依族苗族自治县', '5204', 3); -INSERT INTO `dic_city` VALUES ('520424', '520424', '关岭布依族苗族自治县', '5204', 3); -INSERT INTO `dic_city` VALUES ('520425', '520425', '紫云苗族布依族自治县', '5204', 3); -INSERT INTO `dic_city` VALUES ('5205', '5205', '毕节市', '52', 2); -INSERT INTO `dic_city` VALUES ('520502', '520502', '七星关区', '5205', 3); -INSERT INTO `dic_city` VALUES ('520521', '520521', '大方县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520522', '520522', '黔西县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520523', '520523', '金沙县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520524', '520524', '织金县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520525', '520525', '纳雍县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520526', '520526', '威宁彝族回族苗族自治县', '5205', 3); -INSERT INTO `dic_city` VALUES ('520527', '520527', '赫章县', '5205', 3); -INSERT INTO `dic_city` VALUES ('5206', '5206', '铜仁市', '52', 2); -INSERT INTO `dic_city` VALUES ('520602', '520602', '碧江区', '5206', 3); -INSERT INTO `dic_city` VALUES ('520603', '520603', '万山区', '5206', 3); -INSERT INTO `dic_city` VALUES ('520621', '520621', '江口县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520622', '520622', '玉屏侗族自治县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520623', '520623', '石阡县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520624', '520624', '思南县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520625', '520625', '印江土家族苗族自治县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520626', '520626', '德江县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520627', '520627', '沿河土家族自治县', '5206', 3); -INSERT INTO `dic_city` VALUES ('520628', '520628', '松桃苗族自治县', '5206', 3); -INSERT INTO `dic_city` VALUES ('5223', '5223', '黔西南布依族苗族自治州', '52', 2); -INSERT INTO `dic_city` VALUES ('522301', '522301', '兴义市', '5223', 3); -INSERT INTO `dic_city` VALUES ('522302', '522302', '兴仁市', '5223', 3); -INSERT INTO `dic_city` VALUES ('522323', '522323', '普安县', '5223', 3); -INSERT INTO `dic_city` VALUES ('522324', '522324', '晴隆县', '5223', 3); -INSERT INTO `dic_city` VALUES ('522325', '522325', '贞丰县', '5223', 3); -INSERT INTO `dic_city` VALUES ('522326', '522326', '望谟县', '5223', 3); -INSERT INTO `dic_city` VALUES ('522327', '522327', '册亨县', '5223', 3); -INSERT INTO `dic_city` VALUES ('522328', '522328', '安龙县', '5223', 3); -INSERT INTO `dic_city` VALUES ('5226', '5226', '黔东南苗族侗族自治州', '52', 2); -INSERT INTO `dic_city` VALUES ('522601', '522601', '凯里市', '5226', 3); -INSERT INTO `dic_city` VALUES ('522622', '522622', '黄平县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522623', '522623', '施秉县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522624', '522624', '三穗县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522625', '522625', '镇远县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522626', '522626', '岑巩县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522627', '522627', '天柱县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522628', '522628', '锦屏县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522629', '522629', '剑河县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522630', '522630', '台江县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522631', '522631', '黎平县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522632', '522632', '榕江县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522633', '522633', '从江县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522634', '522634', '雷山县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522635', '522635', '麻江县', '5226', 3); -INSERT INTO `dic_city` VALUES ('522636', '522636', '丹寨县', '5226', 3); -INSERT INTO `dic_city` VALUES ('5227', '5227', '黔南布依族苗族自治州', '52', 2); -INSERT INTO `dic_city` VALUES ('522701', '522701', '都匀市', '5227', 3); -INSERT INTO `dic_city` VALUES ('522702', '522702', '福泉市', '5227', 3); -INSERT INTO `dic_city` VALUES ('522722', '522722', '荔波县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522723', '522723', '贵定县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522725', '522725', '瓮安县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522726', '522726', '独山县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522727', '522727', '平塘县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522728', '522728', '罗甸县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522729', '522729', '长顺县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522730', '522730', '龙里县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522731', '522731', '惠水县', '5227', 3); -INSERT INTO `dic_city` VALUES ('522732', '522732', '三都水族自治县', '5227', 3); -INSERT INTO `dic_city` VALUES ('53', '53', '云南省', NULL, 1); -INSERT INTO `dic_city` VALUES ('5301', '5301', '昆明市', '53', 2); -INSERT INTO `dic_city` VALUES ('530102', '530102', '五华区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530103', '530103', '盘龙区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530111', '530111', '官渡区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530112', '530112', '西山区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530113', '530113', '东川区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530114', '530114', '呈贡区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530115', '530115', '晋宁区', '5301', 3); -INSERT INTO `dic_city` VALUES ('530124', '530124', '富民县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530125', '530125', '宜良县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530126', '530126', '石林彝族自治县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530127', '530127', '嵩明县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530128', '530128', '禄劝彝族苗族自治县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530129', '530129', '寻甸回族彝族自治县', '5301', 3); -INSERT INTO `dic_city` VALUES ('530181', '530181', '安宁市', '5301', 3); -INSERT INTO `dic_city` VALUES ('5303', '5303', '曲靖市', '53', 2); -INSERT INTO `dic_city` VALUES ('530302', '530302', '麒麟区', '5303', 3); -INSERT INTO `dic_city` VALUES ('530303', '530303', '沾益区', '5303', 3); -INSERT INTO `dic_city` VALUES ('530304', '530304', '马龙区', '5303', 3); -INSERT INTO `dic_city` VALUES ('530322', '530322', '陆良县', '5303', 3); -INSERT INTO `dic_city` VALUES ('530323', '530323', '师宗县', '5303', 3); -INSERT INTO `dic_city` VALUES ('530324', '530324', '罗平县', '5303', 3); -INSERT INTO `dic_city` VALUES ('530325', '530325', '富源县', '5303', 3); -INSERT INTO `dic_city` VALUES ('530326', '530326', '会泽县', '5303', 3); -INSERT INTO `dic_city` VALUES ('530381', '530381', '宣威市', '5303', 3); -INSERT INTO `dic_city` VALUES ('5304', '5304', '玉溪市', '53', 2); -INSERT INTO `dic_city` VALUES ('530402', '530402', '红塔区', '5304', 3); -INSERT INTO `dic_city` VALUES ('530403', '530403', '江川区', '5304', 3); -INSERT INTO `dic_city` VALUES ('530423', '530423', '通海县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530424', '530424', '华宁县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530425', '530425', '易门县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530426', '530426', '峨山彝族自治县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530427', '530427', '新平彝族傣族自治县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530428', '530428', '元江哈尼族彝族傣族自治县', '5304', 3); -INSERT INTO `dic_city` VALUES ('530481', '530481', '澄江市', '5304', 3); -INSERT INTO `dic_city` VALUES ('5305', '5305', '保山市', '53', 2); -INSERT INTO `dic_city` VALUES ('530502', '530502', '隆阳区', '5305', 3); -INSERT INTO `dic_city` VALUES ('530521', '530521', '施甸县', '5305', 3); -INSERT INTO `dic_city` VALUES ('530523', '530523', '龙陵县', '5305', 3); -INSERT INTO `dic_city` VALUES ('530524', '530524', '昌宁县', '5305', 3); -INSERT INTO `dic_city` VALUES ('530581', '530581', '腾冲市', '5305', 3); -INSERT INTO `dic_city` VALUES ('5306', '5306', '昭通市', '53', 2); -INSERT INTO `dic_city` VALUES ('530602', '530602', '昭阳区', '5306', 3); -INSERT INTO `dic_city` VALUES ('530621', '530621', '鲁甸县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530622', '530622', '巧家县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530623', '530623', '盐津县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530624', '530624', '大关县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530625', '530625', '永善县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530626', '530626', '绥江县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530627', '530627', '镇雄县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530628', '530628', '彝良县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530629', '530629', '威信县', '5306', 3); -INSERT INTO `dic_city` VALUES ('530681', '530681', '水富市', '5306', 3); -INSERT INTO `dic_city` VALUES ('5307', '5307', '丽江市', '53', 2); -INSERT INTO `dic_city` VALUES ('530702', '530702', '古城区', '5307', 3); -INSERT INTO `dic_city` VALUES ('530721', '530721', '玉龙纳西族自治县', '5307', 3); -INSERT INTO `dic_city` VALUES ('530722', '530722', '永胜县', '5307', 3); -INSERT INTO `dic_city` VALUES ('530723', '530723', '华坪县', '5307', 3); -INSERT INTO `dic_city` VALUES ('530724', '530724', '宁蒗彝族自治县', '5307', 3); -INSERT INTO `dic_city` VALUES ('5308', '5308', '普洱市', '53', 2); -INSERT INTO `dic_city` VALUES ('530802', '530802', '思茅区', '5308', 3); -INSERT INTO `dic_city` VALUES ('530821', '530821', '宁洱哈尼族彝族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530822', '530822', '墨江哈尼族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530823', '530823', '景东彝族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530824', '530824', '景谷傣族彝族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530825', '530825', '镇沅彝族哈尼族拉祜族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530826', '530826', '江城哈尼族彝族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530827', '530827', '孟连傣族拉祜族佤族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530828', '530828', '澜沧拉祜族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('530829', '530829', '西盟佤族自治县', '5308', 3); -INSERT INTO `dic_city` VALUES ('5309', '5309', '临沧市', '53', 2); -INSERT INTO `dic_city` VALUES ('530902', '530902', '临翔区', '5309', 3); -INSERT INTO `dic_city` VALUES ('530921', '530921', '凤庆县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530922', '530922', '云县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530923', '530923', '永德县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530924', '530924', '镇康县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530925', '530925', '双江拉祜族佤族布朗族傣族自治县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530926', '530926', '耿马傣族佤族自治县', '5309', 3); -INSERT INTO `dic_city` VALUES ('530927', '530927', '沧源佤族自治县', '5309', 3); -INSERT INTO `dic_city` VALUES ('5323', '5323', '楚雄彝族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('532301', '532301', '楚雄市', '5323', 3); -INSERT INTO `dic_city` VALUES ('532322', '532322', '双柏县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532323', '532323', '牟定县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532324', '532324', '南华县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532325', '532325', '姚安县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532326', '532326', '大姚县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532327', '532327', '永仁县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532328', '532328', '元谋县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532329', '532329', '武定县', '5323', 3); -INSERT INTO `dic_city` VALUES ('532331', '532331', '禄丰县', '5323', 3); -INSERT INTO `dic_city` VALUES ('5325', '5325', '红河哈尼族彝族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('532501', '532501', '个旧市', '5325', 3); -INSERT INTO `dic_city` VALUES ('532502', '532502', '开远市', '5325', 3); -INSERT INTO `dic_city` VALUES ('532503', '532503', '蒙自市', '5325', 3); -INSERT INTO `dic_city` VALUES ('532504', '532504', '弥勒市', '5325', 3); -INSERT INTO `dic_city` VALUES ('532523', '532523', '屏边苗族自治县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532524', '532524', '建水县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532525', '532525', '石屏县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532527', '532527', '泸西县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532528', '532528', '元阳县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532529', '532529', '红河县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532530', '532530', '金平苗族瑶族傣族自治县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532531', '532531', '绿春县', '5325', 3); -INSERT INTO `dic_city` VALUES ('532532', '532532', '河口瑶族自治县', '5325', 3); -INSERT INTO `dic_city` VALUES ('5326', '5326', '文山壮族苗族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('532601', '532601', '文山市', '5326', 3); -INSERT INTO `dic_city` VALUES ('532622', '532622', '砚山县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532623', '532623', '西畴县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532624', '532624', '麻栗坡县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532625', '532625', '马关县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532626', '532626', '丘北县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532627', '532627', '广南县', '5326', 3); -INSERT INTO `dic_city` VALUES ('532628', '532628', '富宁县', '5326', 3); -INSERT INTO `dic_city` VALUES ('5328', '5328', '西双版纳傣族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('532801', '532801', '景洪市', '5328', 3); -INSERT INTO `dic_city` VALUES ('532822', '532822', '勐海县', '5328', 3); -INSERT INTO `dic_city` VALUES ('532823', '532823', '勐腊县', '5328', 3); -INSERT INTO `dic_city` VALUES ('5329', '5329', '大理白族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('532901', '532901', '大理市', '5329', 3); -INSERT INTO `dic_city` VALUES ('532922', '532922', '漾濞彝族自治县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532923', '532923', '祥云县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532924', '532924', '宾川县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532925', '532925', '弥渡县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532926', '532926', '南涧彝族自治县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532927', '532927', '巍山彝族回族自治县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532928', '532928', '永平县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532929', '532929', '云龙县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532930', '532930', '洱源县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532931', '532931', '剑川县', '5329', 3); -INSERT INTO `dic_city` VALUES ('532932', '532932', '鹤庆县', '5329', 3); -INSERT INTO `dic_city` VALUES ('5331', '5331', '德宏傣族景颇族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('533102', '533102', '瑞丽市', '5331', 3); -INSERT INTO `dic_city` VALUES ('533103', '533103', '芒市', '5331', 3); -INSERT INTO `dic_city` VALUES ('533122', '533122', '梁河县', '5331', 3); -INSERT INTO `dic_city` VALUES ('533123', '533123', '盈江县', '5331', 3); -INSERT INTO `dic_city` VALUES ('533124', '533124', '陇川县', '5331', 3); -INSERT INTO `dic_city` VALUES ('5333', '5333', '怒江傈僳族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('533301', '533301', '泸水市', '5333', 3); -INSERT INTO `dic_city` VALUES ('533323', '533323', '福贡县', '5333', 3); -INSERT INTO `dic_city` VALUES ('533324', '533324', '贡山独龙族怒族自治县', '5333', 3); -INSERT INTO `dic_city` VALUES ('533325', '533325', '兰坪白族普米族自治县', '5333', 3); -INSERT INTO `dic_city` VALUES ('5334', '5334', '迪庆藏族自治州', '53', 2); -INSERT INTO `dic_city` VALUES ('533401', '533401', '香格里拉市', '5334', 3); -INSERT INTO `dic_city` VALUES ('533422', '533422', '德钦县', '5334', 3); -INSERT INTO `dic_city` VALUES ('533423', '533423', '维西傈僳族自治县', '5334', 3); -INSERT INTO `dic_city` VALUES ('54', '54', '西藏自治区', NULL, 1); -INSERT INTO `dic_city` VALUES ('5401', '5401', '拉萨市', '54', 2); -INSERT INTO `dic_city` VALUES ('540102', '540102', '城关区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540103', '540103', '堆龙德庆区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540104', '540104', '达孜区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540121', '540121', '林周县', '5401', 3); -INSERT INTO `dic_city` VALUES ('540122', '540122', '当雄县', '5401', 3); -INSERT INTO `dic_city` VALUES ('540123', '540123', '尼木县', '5401', 3); -INSERT INTO `dic_city` VALUES ('540124', '540124', '曲水县', '5401', 3); -INSERT INTO `dic_city` VALUES ('540127', '540127', '墨竹工卡县', '5401', 3); -INSERT INTO `dic_city` VALUES ('540171', '540171', '格尔木藏青工业园区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540172', '540172', '拉萨经济技术开发区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540173', '540173', '西藏文化旅游创意园区', '5401', 3); -INSERT INTO `dic_city` VALUES ('540174', '540174', '达孜工业园区', '5401', 3); -INSERT INTO `dic_city` VALUES ('5402', '5402', '日喀则市', '54', 2); -INSERT INTO `dic_city` VALUES ('540202', '540202', '桑珠孜区', '5402', 3); -INSERT INTO `dic_city` VALUES ('540221', '540221', '南木林县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540222', '540222', '江孜县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540223', '540223', '定日县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540224', '540224', '萨迦县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540225', '540225', '拉孜县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540226', '540226', '昂仁县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540227', '540227', '谢通门县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540228', '540228', '白朗县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540229', '540229', '仁布县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540230', '540230', '康马县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540231', '540231', '定结县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540232', '540232', '仲巴县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540233', '540233', '亚东县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540234', '540234', '吉隆县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540235', '540235', '聂拉木县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540236', '540236', '萨嘎县', '5402', 3); -INSERT INTO `dic_city` VALUES ('540237', '540237', '岗巴县', '5402', 3); -INSERT INTO `dic_city` VALUES ('5403', '5403', '昌都市', '54', 2); -INSERT INTO `dic_city` VALUES ('540302', '540302', '卡若区', '5403', 3); -INSERT INTO `dic_city` VALUES ('540321', '540321', '江达县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540322', '540322', '贡觉县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540323', '540323', '类乌齐县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540324', '540324', '丁青县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540325', '540325', '察雅县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540326', '540326', '八宿县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540327', '540327', '左贡县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540328', '540328', '芒康县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540329', '540329', '洛隆县', '5403', 3); -INSERT INTO `dic_city` VALUES ('540330', '540330', '边坝县', '5403', 3); -INSERT INTO `dic_city` VALUES ('5404', '5404', '林芝市', '54', 2); -INSERT INTO `dic_city` VALUES ('540402', '540402', '巴宜区', '5404', 3); -INSERT INTO `dic_city` VALUES ('540421', '540421', '工布江达县', '5404', 3); -INSERT INTO `dic_city` VALUES ('540422', '540422', '米林县', '5404', 3); -INSERT INTO `dic_city` VALUES ('540423', '540423', '墨脱县', '5404', 3); -INSERT INTO `dic_city` VALUES ('540424', '540424', '波密县', '5404', 3); -INSERT INTO `dic_city` VALUES ('540425', '540425', '察隅县', '5404', 3); -INSERT INTO `dic_city` VALUES ('540426', '540426', '朗县', '5404', 3); -INSERT INTO `dic_city` VALUES ('5405', '5405', '山南市', '54', 2); -INSERT INTO `dic_city` VALUES ('540502', '540502', '乃东区', '5405', 3); -INSERT INTO `dic_city` VALUES ('540521', '540521', '扎囊县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540522', '540522', '贡嘎县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540523', '540523', '桑日县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540524', '540524', '琼结县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540525', '540525', '曲松县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540526', '540526', '措美县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540527', '540527', '洛扎县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540528', '540528', '加查县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540529', '540529', '隆子县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540530', '540530', '错那县', '5405', 3); -INSERT INTO `dic_city` VALUES ('540531', '540531', '浪卡子县', '5405', 3); -INSERT INTO `dic_city` VALUES ('5406', '5406', '那曲市', '54', 2); -INSERT INTO `dic_city` VALUES ('540602', '540602', '色尼区', '5406', 3); -INSERT INTO `dic_city` VALUES ('540621', '540621', '嘉黎县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540622', '540622', '比如县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540623', '540623', '聂荣县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540624', '540624', '安多县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540625', '540625', '申扎县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540626', '540626', '索县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540627', '540627', '班戈县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540628', '540628', '巴青县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540629', '540629', '尼玛县', '5406', 3); -INSERT INTO `dic_city` VALUES ('540630', '540630', '双湖县', '5406', 3); -INSERT INTO `dic_city` VALUES ('5425', '5425', '阿里地区', '54', 2); -INSERT INTO `dic_city` VALUES ('542521', '542521', '普兰县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542522', '542522', '札达县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542523', '542523', '噶尔县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542524', '542524', '日土县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542525', '542525', '革吉县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542526', '542526', '改则县', '5425', 3); -INSERT INTO `dic_city` VALUES ('542527', '542527', '措勤县', '5425', 3); -INSERT INTO `dic_city` VALUES ('61', '61', '陕西省', NULL, 1); -INSERT INTO `dic_city` VALUES ('6101', '6101', '西安市', '61', 2); -INSERT INTO `dic_city` VALUES ('610102', '610102', '新城区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610103', '610103', '碑林区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610104', '610104', '莲湖区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610111', '610111', '灞桥区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610112', '610112', '未央区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610113', '610113', '雁塔区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610114', '610114', '阎良区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610115', '610115', '临潼区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610116', '610116', '长安区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610117', '610117', '高陵区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610118', '610118', '鄠邑区', '6101', 3); -INSERT INTO `dic_city` VALUES ('610122', '610122', '蓝田县', '6101', 3); -INSERT INTO `dic_city` VALUES ('610124', '610124', '周至县', '6101', 3); -INSERT INTO `dic_city` VALUES ('6102', '6102', '铜川市', '61', 2); -INSERT INTO `dic_city` VALUES ('610202', '610202', '王益区', '6102', 3); -INSERT INTO `dic_city` VALUES ('610203', '610203', '印台区', '6102', 3); -INSERT INTO `dic_city` VALUES ('610204', '610204', '耀州区', '6102', 3); -INSERT INTO `dic_city` VALUES ('610222', '610222', '宜君县', '6102', 3); -INSERT INTO `dic_city` VALUES ('6103', '6103', '宝鸡市', '61', 2); -INSERT INTO `dic_city` VALUES ('610302', '610302', '渭滨区', '6103', 3); -INSERT INTO `dic_city` VALUES ('610303', '610303', '金台区', '6103', 3); -INSERT INTO `dic_city` VALUES ('610304', '610304', '陈仓区', '6103', 3); -INSERT INTO `dic_city` VALUES ('610322', '610322', '凤翔县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610323', '610323', '岐山县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610324', '610324', '扶风县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610326', '610326', '眉县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610327', '610327', '陇县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610328', '610328', '千阳县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610329', '610329', '麟游县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610330', '610330', '凤县', '6103', 3); -INSERT INTO `dic_city` VALUES ('610331', '610331', '太白县', '6103', 3); -INSERT INTO `dic_city` VALUES ('6104', '6104', '咸阳市', '61', 2); -INSERT INTO `dic_city` VALUES ('610402', '610402', '秦都区', '6104', 3); -INSERT INTO `dic_city` VALUES ('610403', '610403', '杨陵区', '6104', 3); -INSERT INTO `dic_city` VALUES ('610404', '610404', '渭城区', '6104', 3); -INSERT INTO `dic_city` VALUES ('610422', '610422', '三原县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610423', '610423', '泾阳县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610424', '610424', '乾县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610425', '610425', '礼泉县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610426', '610426', '永寿县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610428', '610428', '长武县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610429', '610429', '旬邑县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610430', '610430', '淳化县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610431', '610431', '武功县', '6104', 3); -INSERT INTO `dic_city` VALUES ('610481', '610481', '兴平市', '6104', 3); -INSERT INTO `dic_city` VALUES ('610482', '610482', '彬州市', '6104', 3); -INSERT INTO `dic_city` VALUES ('6105', '6105', '渭南市', '61', 2); -INSERT INTO `dic_city` VALUES ('610502', '610502', '临渭区', '6105', 3); -INSERT INTO `dic_city` VALUES ('610503', '610503', '华州区', '6105', 3); -INSERT INTO `dic_city` VALUES ('610522', '610522', '潼关县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610523', '610523', '大荔县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610524', '610524', '合阳县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610525', '610525', '澄城县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610526', '610526', '蒲城县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610527', '610527', '白水县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610528', '610528', '富平县', '6105', 3); -INSERT INTO `dic_city` VALUES ('610581', '610581', '韩城市', '6105', 3); -INSERT INTO `dic_city` VALUES ('610582', '610582', '华阴市', '6105', 3); -INSERT INTO `dic_city` VALUES ('6106', '6106', '延安市', '61', 2); -INSERT INTO `dic_city` VALUES ('610602', '610602', '宝塔区', '6106', 3); -INSERT INTO `dic_city` VALUES ('610603', '610603', '安塞区', '6106', 3); -INSERT INTO `dic_city` VALUES ('610621', '610621', '延长县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610622', '610622', '延川县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610625', '610625', '志丹县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610626', '610626', '吴起县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610627', '610627', '甘泉县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610628', '610628', '富县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610629', '610629', '洛川县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610630', '610630', '宜川县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610631', '610631', '黄龙县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610632', '610632', '黄陵县', '6106', 3); -INSERT INTO `dic_city` VALUES ('610681', '610681', '子长市', '6106', 3); -INSERT INTO `dic_city` VALUES ('6107', '6107', '汉中市', '61', 2); -INSERT INTO `dic_city` VALUES ('610702', '610702', '汉台区', '6107', 3); -INSERT INTO `dic_city` VALUES ('610703', '610703', '南郑区', '6107', 3); -INSERT INTO `dic_city` VALUES ('610722', '610722', '城固县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610723', '610723', '洋县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610724', '610724', '西乡县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610725', '610725', '勉县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610726', '610726', '宁强县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610727', '610727', '略阳县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610728', '610728', '镇巴县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610729', '610729', '留坝县', '6107', 3); -INSERT INTO `dic_city` VALUES ('610730', '610730', '佛坪县', '6107', 3); -INSERT INTO `dic_city` VALUES ('6108', '6108', '榆林市', '61', 2); -INSERT INTO `dic_city` VALUES ('610802', '610802', '榆阳区', '6108', 3); -INSERT INTO `dic_city` VALUES ('610803', '610803', '横山区', '6108', 3); -INSERT INTO `dic_city` VALUES ('610822', '610822', '府谷县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610824', '610824', '靖边县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610825', '610825', '定边县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610826', '610826', '绥德县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610827', '610827', '米脂县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610828', '610828', '佳县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610829', '610829', '吴堡县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610830', '610830', '清涧县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610831', '610831', '子洲县', '6108', 3); -INSERT INTO `dic_city` VALUES ('610881', '610881', '神木市', '6108', 3); -INSERT INTO `dic_city` VALUES ('6109', '6109', '安康市', '61', 2); -INSERT INTO `dic_city` VALUES ('610902', '610902', '汉滨区', '6109', 3); -INSERT INTO `dic_city` VALUES ('610921', '610921', '汉阴县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610922', '610922', '石泉县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610923', '610923', '宁陕县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610924', '610924', '紫阳县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610925', '610925', '岚皋县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610926', '610926', '平利县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610927', '610927', '镇坪县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610928', '610928', '旬阳县', '6109', 3); -INSERT INTO `dic_city` VALUES ('610929', '610929', '白河县', '6109', 3); -INSERT INTO `dic_city` VALUES ('6110', '6110', '商洛市', '61', 2); -INSERT INTO `dic_city` VALUES ('611002', '611002', '商州区', '6110', 3); -INSERT INTO `dic_city` VALUES ('611021', '611021', '洛南县', '6110', 3); -INSERT INTO `dic_city` VALUES ('611022', '611022', '丹凤县', '6110', 3); -INSERT INTO `dic_city` VALUES ('611023', '611023', '商南县', '6110', 3); -INSERT INTO `dic_city` VALUES ('611024', '611024', '山阳县', '6110', 3); -INSERT INTO `dic_city` VALUES ('611025', '611025', '镇安县', '6110', 3); -INSERT INTO `dic_city` VALUES ('611026', '611026', '柞水县', '6110', 3); -INSERT INTO `dic_city` VALUES ('62', '62', '甘肃省', NULL, 1); -INSERT INTO `dic_city` VALUES ('6201', '6201', '兰州市', '62', 2); -INSERT INTO `dic_city` VALUES ('620102', '620102', '城关区', '6201', 3); -INSERT INTO `dic_city` VALUES ('620103', '620103', '七里河区', '6201', 3); -INSERT INTO `dic_city` VALUES ('620104', '620104', '西固区', '6201', 3); -INSERT INTO `dic_city` VALUES ('620105', '620105', '安宁区', '6201', 3); -INSERT INTO `dic_city` VALUES ('620111', '620111', '红古区', '6201', 3); -INSERT INTO `dic_city` VALUES ('620121', '620121', '永登县', '6201', 3); -INSERT INTO `dic_city` VALUES ('620122', '620122', '皋兰县', '6201', 3); -INSERT INTO `dic_city` VALUES ('620123', '620123', '榆中县', '6201', 3); -INSERT INTO `dic_city` VALUES ('620171', '620171', '兰州新区', '6201', 3); -INSERT INTO `dic_city` VALUES ('6202', '6202', '嘉峪关市', '62', 2); -INSERT INTO `dic_city` VALUES ('620201001', '620201001', '雄关街道', '6202', 3); -INSERT INTO `dic_city` VALUES ('620201002', '620201002', '钢城街道', '6202', 3); -INSERT INTO `dic_city` VALUES ('620201100', '620201100', '新城镇', '6202', 3); -INSERT INTO `dic_city` VALUES ('620201101', '620201101', '峪泉镇', '6202', 3); -INSERT INTO `dic_city` VALUES ('620201102', '620201102', '文殊镇', '6202', 3); -INSERT INTO `dic_city` VALUES ('6203', '6203', '金昌市', '62', 2); -INSERT INTO `dic_city` VALUES ('620302', '620302', '金川区', '6203', 3); -INSERT INTO `dic_city` VALUES ('620321', '620321', '永昌县', '6203', 3); -INSERT INTO `dic_city` VALUES ('6204', '6204', '白银市', '62', 2); -INSERT INTO `dic_city` VALUES ('620402', '620402', '白银区', '6204', 3); -INSERT INTO `dic_city` VALUES ('620403', '620403', '平川区', '6204', 3); -INSERT INTO `dic_city` VALUES ('620421', '620421', '靖远县', '6204', 3); -INSERT INTO `dic_city` VALUES ('620422', '620422', '会宁县', '6204', 3); -INSERT INTO `dic_city` VALUES ('620423', '620423', '景泰县', '6204', 3); -INSERT INTO `dic_city` VALUES ('6205', '6205', '天水市', '62', 2); -INSERT INTO `dic_city` VALUES ('620502', '620502', '秦州区', '6205', 3); -INSERT INTO `dic_city` VALUES ('620503', '620503', '麦积区', '6205', 3); -INSERT INTO `dic_city` VALUES ('620521', '620521', '清水县', '6205', 3); -INSERT INTO `dic_city` VALUES ('620522', '620522', '秦安县', '6205', 3); -INSERT INTO `dic_city` VALUES ('620523', '620523', '甘谷县', '6205', 3); -INSERT INTO `dic_city` VALUES ('620524', '620524', '武山县', '6205', 3); -INSERT INTO `dic_city` VALUES ('620525', '620525', '张家川回族自治县', '6205', 3); -INSERT INTO `dic_city` VALUES ('6206', '6206', '武威市', '62', 2); -INSERT INTO `dic_city` VALUES ('620602', '620602', '凉州区', '6206', 3); -INSERT INTO `dic_city` VALUES ('620621', '620621', '民勤县', '6206', 3); -INSERT INTO `dic_city` VALUES ('620622', '620622', '古浪县', '6206', 3); -INSERT INTO `dic_city` VALUES ('620623', '620623', '天祝藏族自治县', '6206', 3); -INSERT INTO `dic_city` VALUES ('6207', '6207', '张掖市', '62', 2); -INSERT INTO `dic_city` VALUES ('620702', '620702', '甘州区', '6207', 3); -INSERT INTO `dic_city` VALUES ('620721', '620721', '肃南裕固族自治县', '6207', 3); -INSERT INTO `dic_city` VALUES ('620722', '620722', '民乐县', '6207', 3); -INSERT INTO `dic_city` VALUES ('620723', '620723', '临泽县', '6207', 3); -INSERT INTO `dic_city` VALUES ('620724', '620724', '高台县', '6207', 3); -INSERT INTO `dic_city` VALUES ('620725', '620725', '山丹县', '6207', 3); -INSERT INTO `dic_city` VALUES ('6208', '6208', '平凉市', '62', 2); -INSERT INTO `dic_city` VALUES ('620802', '620802', '崆峒区', '6208', 3); -INSERT INTO `dic_city` VALUES ('620821', '620821', '泾川县', '6208', 3); -INSERT INTO `dic_city` VALUES ('620822', '620822', '灵台县', '6208', 3); -INSERT INTO `dic_city` VALUES ('620823', '620823', '崇信县', '6208', 3); -INSERT INTO `dic_city` VALUES ('620825', '620825', '庄浪县', '6208', 3); -INSERT INTO `dic_city` VALUES ('620826', '620826', '静宁县', '6208', 3); -INSERT INTO `dic_city` VALUES ('620881', '620881', '华亭市', '6208', 3); -INSERT INTO `dic_city` VALUES ('6209', '6209', '酒泉市', '62', 2); -INSERT INTO `dic_city` VALUES ('620902', '620902', '肃州区', '6209', 3); -INSERT INTO `dic_city` VALUES ('620921', '620921', '金塔县', '6209', 3); -INSERT INTO `dic_city` VALUES ('620922', '620922', '瓜州县', '6209', 3); -INSERT INTO `dic_city` VALUES ('620923', '620923', '肃北蒙古族自治县', '6209', 3); -INSERT INTO `dic_city` VALUES ('620924', '620924', '阿克塞哈萨克族自治县', '6209', 3); -INSERT INTO `dic_city` VALUES ('620981', '620981', '玉门市', '6209', 3); -INSERT INTO `dic_city` VALUES ('620982', '620982', '敦煌市', '6209', 3); -INSERT INTO `dic_city` VALUES ('6210', '6210', '庆阳市', '62', 2); -INSERT INTO `dic_city` VALUES ('621002', '621002', '西峰区', '6210', 3); -INSERT INTO `dic_city` VALUES ('621021', '621021', '庆城县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621022', '621022', '环县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621023', '621023', '华池县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621024', '621024', '合水县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621025', '621025', '正宁县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621026', '621026', '宁县', '6210', 3); -INSERT INTO `dic_city` VALUES ('621027', '621027', '镇原县', '6210', 3); -INSERT INTO `dic_city` VALUES ('6211', '6211', '定西市', '62', 2); -INSERT INTO `dic_city` VALUES ('621102', '621102', '安定区', '6211', 3); -INSERT INTO `dic_city` VALUES ('621121', '621121', '通渭县', '6211', 3); -INSERT INTO `dic_city` VALUES ('621122', '621122', '陇西县', '6211', 3); -INSERT INTO `dic_city` VALUES ('621123', '621123', '渭源县', '6211', 3); -INSERT INTO `dic_city` VALUES ('621124', '621124', '临洮县', '6211', 3); -INSERT INTO `dic_city` VALUES ('621125', '621125', '漳县', '6211', 3); -INSERT INTO `dic_city` VALUES ('621126', '621126', '岷县', '6211', 3); -INSERT INTO `dic_city` VALUES ('6212', '6212', '陇南市', '62', 2); -INSERT INTO `dic_city` VALUES ('621202', '621202', '武都区', '6212', 3); -INSERT INTO `dic_city` VALUES ('621221', '621221', '成县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621222', '621222', '文县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621223', '621223', '宕昌县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621224', '621224', '康县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621225', '621225', '西和县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621226', '621226', '礼县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621227', '621227', '徽县', '6212', 3); -INSERT INTO `dic_city` VALUES ('621228', '621228', '两当县', '6212', 3); -INSERT INTO `dic_city` VALUES ('6229', '6229', '临夏回族自治州', '62', 2); -INSERT INTO `dic_city` VALUES ('622901', '622901', '临夏市', '6229', 3); -INSERT INTO `dic_city` VALUES ('622921', '622921', '临夏县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622922', '622922', '康乐县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622923', '622923', '永靖县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622924', '622924', '广河县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622925', '622925', '和政县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622926', '622926', '东乡族自治县', '6229', 3); -INSERT INTO `dic_city` VALUES ('622927', '622927', '积石山保安族东乡族撒拉族自治县', '6229', 3); -INSERT INTO `dic_city` VALUES ('6230', '6230', '甘南藏族自治州', '62', 2); -INSERT INTO `dic_city` VALUES ('623001', '623001', '合作市', '6230', 3); -INSERT INTO `dic_city` VALUES ('623021', '623021', '临潭县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623022', '623022', '卓尼县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623023', '623023', '舟曲县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623024', '623024', '迭部县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623025', '623025', '玛曲县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623026', '623026', '碌曲县', '6230', 3); -INSERT INTO `dic_city` VALUES ('623027', '623027', '夏河县', '6230', 3); -INSERT INTO `dic_city` VALUES ('63', '63', '青海省', NULL, 1); -INSERT INTO `dic_city` VALUES ('6301', '6301', '西宁市', '63', 2); -INSERT INTO `dic_city` VALUES ('630102', '630102', '城东区', '6301', 3); -INSERT INTO `dic_city` VALUES ('630103', '630103', '城中区', '6301', 3); -INSERT INTO `dic_city` VALUES ('630104', '630104', '城西区', '6301', 3); -INSERT INTO `dic_city` VALUES ('630105', '630105', '城北区', '6301', 3); -INSERT INTO `dic_city` VALUES ('630106', '630106', '湟中区', '6301', 3); -INSERT INTO `dic_city` VALUES ('630121', '630121', '大通回族土族自治县', '6301', 3); -INSERT INTO `dic_city` VALUES ('630123', '630123', '湟源县', '6301', 3); -INSERT INTO `dic_city` VALUES ('6302', '6302', '海东市', '63', 2); -INSERT INTO `dic_city` VALUES ('630202', '630202', '乐都区', '6302', 3); -INSERT INTO `dic_city` VALUES ('630203', '630203', '平安区', '6302', 3); -INSERT INTO `dic_city` VALUES ('630222', '630222', '民和回族土族自治县', '6302', 3); -INSERT INTO `dic_city` VALUES ('630223', '630223', '互助土族自治县', '6302', 3); -INSERT INTO `dic_city` VALUES ('630224', '630224', '化隆回族自治县', '6302', 3); -INSERT INTO `dic_city` VALUES ('630225', '630225', '循化撒拉族自治县', '6302', 3); -INSERT INTO `dic_city` VALUES ('6322', '6322', '海北藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632221', '632221', '门源回族自治县', '6322', 3); -INSERT INTO `dic_city` VALUES ('632222', '632222', '祁连县', '6322', 3); -INSERT INTO `dic_city` VALUES ('632223', '632223', '海晏县', '6322', 3); -INSERT INTO `dic_city` VALUES ('632224', '632224', '刚察县', '6322', 3); -INSERT INTO `dic_city` VALUES ('6323', '6323', '黄南藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632321', '632321', '同仁县', '6323', 3); -INSERT INTO `dic_city` VALUES ('632322', '632322', '尖扎县', '6323', 3); -INSERT INTO `dic_city` VALUES ('632323', '632323', '泽库县', '6323', 3); -INSERT INTO `dic_city` VALUES ('632324', '632324', '河南蒙古族自治县', '6323', 3); -INSERT INTO `dic_city` VALUES ('6325', '6325', '海南藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632521', '632521', '共和县', '6325', 3); -INSERT INTO `dic_city` VALUES ('632522', '632522', '同德县', '6325', 3); -INSERT INTO `dic_city` VALUES ('632523', '632523', '贵德县', '6325', 3); -INSERT INTO `dic_city` VALUES ('632524', '632524', '兴海县', '6325', 3); -INSERT INTO `dic_city` VALUES ('632525', '632525', '贵南县', '6325', 3); -INSERT INTO `dic_city` VALUES ('6326', '6326', '果洛藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632621', '632621', '玛沁县', '6326', 3); -INSERT INTO `dic_city` VALUES ('632622', '632622', '班玛县', '6326', 3); -INSERT INTO `dic_city` VALUES ('632623', '632623', '甘德县', '6326', 3); -INSERT INTO `dic_city` VALUES ('632624', '632624', '达日县', '6326', 3); -INSERT INTO `dic_city` VALUES ('632625', '632625', '久治县', '6326', 3); -INSERT INTO `dic_city` VALUES ('632626', '632626', '玛多县', '6326', 3); -INSERT INTO `dic_city` VALUES ('6327', '6327', '玉树藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632701', '632701', '玉树市', '6327', 3); -INSERT INTO `dic_city` VALUES ('632722', '632722', '杂多县', '6327', 3); -INSERT INTO `dic_city` VALUES ('632723', '632723', '称多县', '6327', 3); -INSERT INTO `dic_city` VALUES ('632724', '632724', '治多县', '6327', 3); -INSERT INTO `dic_city` VALUES ('632725', '632725', '囊谦县', '6327', 3); -INSERT INTO `dic_city` VALUES ('632726', '632726', '曲麻莱县', '6327', 3); -INSERT INTO `dic_city` VALUES ('6328', '6328', '海西蒙古族藏族自治州', '63', 2); -INSERT INTO `dic_city` VALUES ('632801', '632801', '格尔木市', '6328', 3); -INSERT INTO `dic_city` VALUES ('632802', '632802', '德令哈市', '6328', 3); -INSERT INTO `dic_city` VALUES ('632803', '632803', '茫崖市', '6328', 3); -INSERT INTO `dic_city` VALUES ('632821', '632821', '乌兰县', '6328', 3); -INSERT INTO `dic_city` VALUES ('632822', '632822', '都兰县', '6328', 3); -INSERT INTO `dic_city` VALUES ('632823', '632823', '天峻县', '6328', 3); -INSERT INTO `dic_city` VALUES ('632857', '632857', '大柴旦行政委员会', '6328', 3); -INSERT INTO `dic_city` VALUES ('64', '64', '宁夏回族自治区', NULL, 1); -INSERT INTO `dic_city` VALUES ('6401', '6401', '银川市', '64', 2); -INSERT INTO `dic_city` VALUES ('640104', '640104', '兴庆区', '6401', 3); -INSERT INTO `dic_city` VALUES ('640105', '640105', '西夏区', '6401', 3); -INSERT INTO `dic_city` VALUES ('640106', '640106', '金凤区', '6401', 3); -INSERT INTO `dic_city` VALUES ('640121', '640121', '永宁县', '6401', 3); -INSERT INTO `dic_city` VALUES ('640122', '640122', '贺兰县', '6401', 3); -INSERT INTO `dic_city` VALUES ('640181', '640181', '灵武市', '6401', 3); -INSERT INTO `dic_city` VALUES ('6402', '6402', '石嘴山市', '64', 2); -INSERT INTO `dic_city` VALUES ('640202', '640202', '大武口区', '6402', 3); -INSERT INTO `dic_city` VALUES ('640205', '640205', '惠农区', '6402', 3); -INSERT INTO `dic_city` VALUES ('640221', '640221', '平罗县', '6402', 3); -INSERT INTO `dic_city` VALUES ('6403', '6403', '吴忠市', '64', 2); -INSERT INTO `dic_city` VALUES ('640302', '640302', '利通区', '6403', 3); -INSERT INTO `dic_city` VALUES ('640303', '640303', '红寺堡区', '6403', 3); -INSERT INTO `dic_city` VALUES ('640323', '640323', '盐池县', '6403', 3); -INSERT INTO `dic_city` VALUES ('640324', '640324', '同心县', '6403', 3); -INSERT INTO `dic_city` VALUES ('640381', '640381', '青铜峡市', '6403', 3); -INSERT INTO `dic_city` VALUES ('6404', '6404', '固原市', '64', 2); -INSERT INTO `dic_city` VALUES ('640402', '640402', '原州区', '6404', 3); -INSERT INTO `dic_city` VALUES ('640422', '640422', '西吉县', '6404', 3); -INSERT INTO `dic_city` VALUES ('640423', '640423', '隆德县', '6404', 3); -INSERT INTO `dic_city` VALUES ('640424', '640424', '泾源县', '6404', 3); -INSERT INTO `dic_city` VALUES ('640425', '640425', '彭阳县', '6404', 3); -INSERT INTO `dic_city` VALUES ('6405', '6405', '中卫市', '64', 2); -INSERT INTO `dic_city` VALUES ('640502', '640502', '沙坡头区', '6405', 3); -INSERT INTO `dic_city` VALUES ('640521', '640521', '中宁县', '6405', 3); -INSERT INTO `dic_city` VALUES ('640522', '640522', '海原县', '6405', 3); -INSERT INTO `dic_city` VALUES ('65', '65', '新疆维吾尔自治区', NULL, 1); -INSERT INTO `dic_city` VALUES ('6501', '6501', '乌鲁木齐市', '65', 2); -INSERT INTO `dic_city` VALUES ('650102', '650102', '天山区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650103', '650103', '沙依巴克区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650104', '650104', '新市区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650105', '650105', '水磨沟区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650106', '650106', '头屯河区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650107', '650107', '达坂城区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650109', '650109', '米东区', '6501', 3); -INSERT INTO `dic_city` VALUES ('650121', '650121', '乌鲁木齐县', '6501', 3); -INSERT INTO `dic_city` VALUES ('6502', '6502', '克拉玛依市', '65', 2); -INSERT INTO `dic_city` VALUES ('650202', '650202', '独山子区', '6502', 3); -INSERT INTO `dic_city` VALUES ('650203', '650203', '克拉玛依区', '6502', 3); -INSERT INTO `dic_city` VALUES ('650204', '650204', '白碱滩区', '6502', 3); -INSERT INTO `dic_city` VALUES ('650205', '650205', '乌尔禾区', '6502', 3); -INSERT INTO `dic_city` VALUES ('6504', '6504', '吐鲁番市', '65', 2); -INSERT INTO `dic_city` VALUES ('650402', '650402', '高昌区', '6504', 3); -INSERT INTO `dic_city` VALUES ('650421', '650421', '鄯善县', '6504', 3); -INSERT INTO `dic_city` VALUES ('650422', '650422', '托克逊县', '6504', 3); -INSERT INTO `dic_city` VALUES ('6505', '6505', '哈密市', '65', 2); -INSERT INTO `dic_city` VALUES ('650502', '650502', '伊州区', '6505', 3); -INSERT INTO `dic_city` VALUES ('650521', '650521', '巴里坤哈萨克自治县', '6505', 3); -INSERT INTO `dic_city` VALUES ('650522', '650522', '伊吾县', '6505', 3); -INSERT INTO `dic_city` VALUES ('6523', '6523', '昌吉回族自治州', '65', 2); -INSERT INTO `dic_city` VALUES ('652301', '652301', '昌吉市', '6523', 3); -INSERT INTO `dic_city` VALUES ('652302', '652302', '阜康市', '6523', 3); -INSERT INTO `dic_city` VALUES ('652323', '652323', '呼图壁县', '6523', 3); -INSERT INTO `dic_city` VALUES ('652324', '652324', '玛纳斯县', '6523', 3); -INSERT INTO `dic_city` VALUES ('652325', '652325', '奇台县', '6523', 3); -INSERT INTO `dic_city` VALUES ('652327', '652327', '吉木萨尔县', '6523', 3); -INSERT INTO `dic_city` VALUES ('652328', '652328', '木垒哈萨克自治县', '6523', 3); -INSERT INTO `dic_city` VALUES ('6527', '6527', '博尔塔拉蒙古自治州', '65', 2); -INSERT INTO `dic_city` VALUES ('652701', '652701', '博乐市', '6527', 3); -INSERT INTO `dic_city` VALUES ('652702', '652702', '阿拉山口市', '6527', 3); -INSERT INTO `dic_city` VALUES ('652722', '652722', '精河县', '6527', 3); -INSERT INTO `dic_city` VALUES ('652723', '652723', '温泉县', '6527', 3); -INSERT INTO `dic_city` VALUES ('6528', '6528', '巴音郭楞蒙古自治州', '65', 2); -INSERT INTO `dic_city` VALUES ('652801', '652801', '库尔勒市', '6528', 3); -INSERT INTO `dic_city` VALUES ('652822', '652822', '轮台县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652823', '652823', '尉犁县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652824', '652824', '若羌县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652825', '652825', '且末县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652826', '652826', '焉耆回族自治县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652827', '652827', '和静县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652828', '652828', '和硕县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652829', '652829', '博湖县', '6528', 3); -INSERT INTO `dic_city` VALUES ('652871', '652871', '库尔勒经济技术开发区', '6528', 3); -INSERT INTO `dic_city` VALUES ('6529', '6529', '阿克苏地区', '65', 2); -INSERT INTO `dic_city` VALUES ('652901', '652901', '阿克苏市', '6529', 3); -INSERT INTO `dic_city` VALUES ('652902', '652902', '库车市', '6529', 3); -INSERT INTO `dic_city` VALUES ('652922', '652922', '温宿县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652924', '652924', '沙雅县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652925', '652925', '新和县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652926', '652926', '拜城县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652927', '652927', '乌什县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652928', '652928', '阿瓦提县', '6529', 3); -INSERT INTO `dic_city` VALUES ('652929', '652929', '柯坪县', '6529', 3); -INSERT INTO `dic_city` VALUES ('6530', '6530', '克孜勒苏柯尔克孜自治州', '65', 2); -INSERT INTO `dic_city` VALUES ('653001', '653001', '阿图什市', '6530', 3); -INSERT INTO `dic_city` VALUES ('653022', '653022', '阿克陶县', '6530', 3); -INSERT INTO `dic_city` VALUES ('653023', '653023', '阿合奇县', '6530', 3); -INSERT INTO `dic_city` VALUES ('653024', '653024', '乌恰县', '6530', 3); -INSERT INTO `dic_city` VALUES ('6531', '6531', '喀什地区', '65', 2); -INSERT INTO `dic_city` VALUES ('653101', '653101', '喀什市', '6531', 3); -INSERT INTO `dic_city` VALUES ('653121', '653121', '疏附县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653122', '653122', '疏勒县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653123', '653123', '英吉沙县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653124', '653124', '泽普县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653125', '653125', '莎车县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653126', '653126', '叶城县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653127', '653127', '麦盖提县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653128', '653128', '岳普湖县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653129', '653129', '伽师县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653130', '653130', '巴楚县', '6531', 3); -INSERT INTO `dic_city` VALUES ('653131', '653131', '塔什库尔干塔吉克自治县', '6531', 3); -INSERT INTO `dic_city` VALUES ('6532', '6532', '和田地区', '65', 2); -INSERT INTO `dic_city` VALUES ('653201', '653201', '和田市', '6532', 3); -INSERT INTO `dic_city` VALUES ('653221', '653221', '和田县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653222', '653222', '墨玉县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653223', '653223', '皮山县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653224', '653224', '洛浦县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653225', '653225', '策勒县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653226', '653226', '于田县', '6532', 3); -INSERT INTO `dic_city` VALUES ('653227', '653227', '民丰县', '6532', 3); -INSERT INTO `dic_city` VALUES ('6540', '6540', '伊犁哈萨克自治州', '65', 2); -INSERT INTO `dic_city` VALUES ('654002', '654002', '伊宁市', '6540', 3); -INSERT INTO `dic_city` VALUES ('654003', '654003', '奎屯市', '6540', 3); -INSERT INTO `dic_city` VALUES ('654004', '654004', '霍尔果斯市', '6540', 3); -INSERT INTO `dic_city` VALUES ('654021', '654021', '伊宁县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654022', '654022', '察布查尔锡伯自治县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654023', '654023', '霍城县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654024', '654024', '巩留县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654025', '654025', '新源县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654026', '654026', '昭苏县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654027', '654027', '特克斯县', '6540', 3); -INSERT INTO `dic_city` VALUES ('654028', '654028', '尼勒克县', '6540', 3); -INSERT INTO `dic_city` VALUES ('6542', '6542', '塔城地区', '65', 2); -INSERT INTO `dic_city` VALUES ('654201', '654201', '塔城市', '6542', 3); -INSERT INTO `dic_city` VALUES ('654202', '654202', '乌苏市', '6542', 3); -INSERT INTO `dic_city` VALUES ('654221', '654221', '额敏县', '6542', 3); -INSERT INTO `dic_city` VALUES ('654223', '654223', '沙湾县', '6542', 3); -INSERT INTO `dic_city` VALUES ('654224', '654224', '托里县', '6542', 3); -INSERT INTO `dic_city` VALUES ('654225', '654225', '裕民县', '6542', 3); -INSERT INTO `dic_city` VALUES ('654226', '654226', '和布克赛尔蒙古自治县', '6542', 3); -INSERT INTO `dic_city` VALUES ('6543', '6543', '阿勒泰地区', '65', 2); -INSERT INTO `dic_city` VALUES ('654301', '654301', '阿勒泰市', '6543', 3); -INSERT INTO `dic_city` VALUES ('654321', '654321', '布尔津县', '6543', 3); -INSERT INTO `dic_city` VALUES ('654322', '654322', '富蕴县', '6543', 3); -INSERT INTO `dic_city` VALUES ('654323', '654323', '福海县', '6543', 3); -INSERT INTO `dic_city` VALUES ('654324', '654324', '哈巴河县', '6543', 3); -INSERT INTO `dic_city` VALUES ('654325', '654325', '青河县', '6543', 3); -INSERT INTO `dic_city` VALUES ('654326', '654326', '吉木乃县', '6543', 3); -INSERT INTO `dic_city` VALUES ('6590', '6590', '自治区直辖县级行政区划', '65', 2); -INSERT INTO `dic_city` VALUES ('659001', '659001', '石河子市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659002', '659002', '阿拉尔市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659003', '659003', '图木舒克市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659004', '659004', '五家渠市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659005', '659005', '北屯市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659006', '659006', '铁门关市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659007', '659007', '双河市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659008', '659008', '可克达拉市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659009', '659009', '昆玉市', '6590', 3); -INSERT INTO `dic_city` VALUES ('659010', '659010', '胡杨河市', '6590', 3); +BEGIN; +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('11', '11', '北京市', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1101', '1101', '市辖区', '11', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110101', '110101', '东城区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110102', '110102', '西城区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110105', '110105', '朝阳区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110106', '110106', '丰台区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110107', '110107', '石景山区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110108', '110108', '海淀区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110109', '110109', '门头沟区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110111', '110111', '房山区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110112', '110112', '通州区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110113', '110113', '顺义区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110114', '110114', '昌平区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110115', '110115', '大兴区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110116', '110116', '怀柔区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110117', '110117', '平谷区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110118', '110118', '密云区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('110119', '110119', '延庆区', '1101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('12', '12', '天津市', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1201', '1201', '市辖区', '12', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120101', '120101', '和平区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120102', '120102', '河东区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120103', '120103', '河西区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120104', '120104', '南开区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120105', '120105', '河北区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120106', '120106', '红桥区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120110', '120110', '东丽区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120111', '120111', '西青区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120112', '120112', '津南区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120113', '120113', '北辰区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120114', '120114', '武清区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120115', '120115', '宝坻区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120116', '120116', '滨海新区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120117', '120117', '宁河区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120118', '120118', '静海区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('120119', '120119', '蓟州区', '1201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('13', '13', '河北省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1301', '1301', '石家庄市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130102', '130102', '长安区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130104', '130104', '桥西区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130105', '130105', '新华区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130107', '130107', '井陉矿区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130108', '130108', '裕华区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130109', '130109', '藁城区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130110', '130110', '鹿泉区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130111', '130111', '栾城区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130121', '130121', '井陉县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130123', '130123', '正定县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130125', '130125', '行唐县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130126', '130126', '灵寿县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130127', '130127', '高邑县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130128', '130128', '深泽县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130129', '130129', '赞皇县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130130', '130130', '无极县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130131', '130131', '平山县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130132', '130132', '元氏县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130133', '130133', '赵县', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130171', '130171', '石家庄高新技术产业开发区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130172', '130172', '石家庄循环化工园区', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130181', '130181', '辛集市', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130183', '130183', '晋州市', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130184', '130184', '新乐市', '1301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1302', '1302', '唐山市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130202', '130202', '路南区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130203', '130203', '路北区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130204', '130204', '古冶区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130205', '130205', '开平区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130207', '130207', '丰南区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130208', '130208', '丰润区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130209', '130209', '曹妃甸区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130224', '130224', '滦南县', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130225', '130225', '乐亭县', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130227', '130227', '迁西县', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130229', '130229', '玉田县', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130271', '130271', '河北唐山芦台经济开发区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130272', '130272', '唐山市汉沽管理区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130273', '130273', '唐山高新技术产业开发区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130274', '130274', '河北唐山海港经济开发区', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130281', '130281', '遵化市', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130283', '130283', '迁安市', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130284', '130284', '滦州市', '1302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1303', '1303', '秦皇岛市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130302', '130302', '海港区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130303', '130303', '山海关区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130304', '130304', '北戴河区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130306', '130306', '抚宁区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130321', '130321', '青龙满族自治县', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130322', '130322', '昌黎县', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130324', '130324', '卢龙县', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130371', '130371', '秦皇岛市经济技术开发区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130372', '130372', '北戴河新区', '1303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1304', '1304', '邯郸市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130402', '130402', '邯山区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130403', '130403', '丛台区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130404', '130404', '复兴区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130406', '130406', '峰峰矿区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130407', '130407', '肥乡区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130408', '130408', '永年区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130423', '130423', '临漳县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130424', '130424', '成安县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130425', '130425', '大名县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130426', '130426', '涉县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130427', '130427', '磁县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130430', '130430', '邱县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130431', '130431', '鸡泽县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130432', '130432', '广平县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130433', '130433', '馆陶县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130434', '130434', '魏县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130435', '130435', '曲周县', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130471', '130471', '邯郸经济技术开发区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130473', '130473', '邯郸冀南新区', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130481', '130481', '武安市', '1304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1305', '1305', '邢台市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130502', '130502', '襄都区', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130503', '130503', '信都区', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130505', '130505', '任泽区', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130506', '130506', '南和区', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130522', '130522', '临城县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130523', '130523', '内丘县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130524', '130524', '柏乡县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130525', '130525', '隆尧县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130528', '130528', '宁晋县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130529', '130529', '巨鹿县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130530', '130530', '新河县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130531', '130531', '广宗县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130532', '130532', '平乡县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130533', '130533', '威县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130534', '130534', '清河县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130535', '130535', '临西县', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130571', '130571', '河北邢台经济开发区', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130581', '130581', '南宫市', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130582', '130582', '沙河市', '1305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1306', '1306', '保定市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130602', '130602', '竞秀区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130606', '130606', '莲池区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130607', '130607', '满城区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130608', '130608', '清苑区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130609', '130609', '徐水区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130623', '130623', '涞水县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130624', '130624', '阜平县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130626', '130626', '定兴县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130627', '130627', '唐县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130628', '130628', '高阳县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130629', '130629', '容城县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130630', '130630', '涞源县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130631', '130631', '望都县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130632', '130632', '安新县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130633', '130633', '易县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130634', '130634', '曲阳县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130635', '130635', '蠡县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130636', '130636', '顺平县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130637', '130637', '博野县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130638', '130638', '雄县', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130671', '130671', '保定高新技术产业开发区', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130672', '130672', '保定白沟新城', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130681', '130681', '涿州市', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130682', '130682', '定州市', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130683', '130683', '安国市', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130684', '130684', '高碑店市', '1306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1307', '1307', '张家口市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130702', '130702', '桥东区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130703', '130703', '桥西区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130705', '130705', '宣化区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130706', '130706', '下花园区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130708', '130708', '万全区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130709', '130709', '崇礼区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130722', '130722', '张北县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130723', '130723', '康保县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130724', '130724', '沽源县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130725', '130725', '尚义县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130726', '130726', '蔚县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130727', '130727', '阳原县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130728', '130728', '怀安县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130730', '130730', '怀来县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130731', '130731', '涿鹿县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130732', '130732', '赤城县', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130771', '130771', '张家口经济开发区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130772', '130772', '张家口市察北管理区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130773', '130773', '张家口市塞北管理区', '1307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1308', '1308', '承德市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130802', '130802', '双桥区', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130803', '130803', '双滦区', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130804', '130804', '鹰手营子矿区', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130821', '130821', '承德县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130822', '130822', '兴隆县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130824', '130824', '滦平县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130825', '130825', '隆化县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130826', '130826', '丰宁满族自治县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130827', '130827', '宽城满族自治县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130828', '130828', '围场满族蒙古族自治县', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130871', '130871', '承德高新技术产业开发区', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130881', '130881', '平泉市', '1308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1309', '1309', '沧州市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130902', '130902', '新华区', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130903', '130903', '运河区', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130921', '130921', '沧县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130922', '130922', '青县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130923', '130923', '东光县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130924', '130924', '海兴县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130925', '130925', '盐山县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130926', '130926', '肃宁县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130927', '130927', '南皮县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130928', '130928', '吴桥县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130929', '130929', '献县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130930', '130930', '孟村回族自治县', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130971', '130971', '河北沧州经济开发区', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130972', '130972', '沧州高新技术产业开发区', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130973', '130973', '沧州渤海新区', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130981', '130981', '泊头市', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130982', '130982', '任丘市', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130983', '130983', '黄骅市', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('130984', '130984', '河间市', '1309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1310', '1310', '廊坊市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131002', '131002', '安次区', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131003', '131003', '广阳区', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131022', '131022', '固安县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131023', '131023', '永清县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131024', '131024', '香河县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131025', '131025', '大城县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131026', '131026', '文安县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131028', '131028', '大厂回族自治县', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131071', '131071', '廊坊经济技术开发区', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131081', '131081', '霸州市', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131082', '131082', '三河市', '1310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1311', '1311', '衡水市', '13', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131102', '131102', '桃城区', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131103', '131103', '冀州区', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131121', '131121', '枣强县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131122', '131122', '武邑县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131123', '131123', '武强县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131124', '131124', '饶阳县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131125', '131125', '安平县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131126', '131126', '故城县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131127', '131127', '景县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131128', '131128', '阜城县', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131171', '131171', '河北衡水高新技术产业开发区', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131172', '131172', '衡水滨湖新区', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('131182', '131182', '深州市', '1311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('14', '14', '山西省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1401', '1401', '太原市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140105', '140105', '小店区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140106', '140106', '迎泽区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140107', '140107', '杏花岭区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140108', '140108', '尖草坪区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140109', '140109', '万柏林区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140110', '140110', '晋源区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140121', '140121', '清徐县', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140122', '140122', '阳曲县', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140123', '140123', '娄烦县', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140171', '140171', '山西转型综合改革示范区', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140181', '140181', '古交市', '1401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1402', '1402', '大同市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140212', '140212', '新荣区', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140213', '140213', '平城区', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140214', '140214', '云冈区', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140215', '140215', '云州区', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140221', '140221', '阳高县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140222', '140222', '天镇县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140223', '140223', '广灵县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140224', '140224', '灵丘县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140225', '140225', '浑源县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140226', '140226', '左云县', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140271', '140271', '山西大同经济开发区', '1402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1403', '1403', '阳泉市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140302', '140302', '城区', '1403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140303', '140303', '矿区', '1403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140311', '140311', '郊区', '1403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140321', '140321', '平定县', '1403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140322', '140322', '盂县', '1403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1404', '1404', '长治市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140403', '140403', '潞州区', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140404', '140404', '上党区', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140405', '140405', '屯留区', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140406', '140406', '潞城区', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140423', '140423', '襄垣县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140425', '140425', '平顺县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140426', '140426', '黎城县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140427', '140427', '壶关县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140428', '140428', '长子县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140429', '140429', '武乡县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140430', '140430', '沁县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140431', '140431', '沁源县', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140471', '140471', '山西长治高新技术产业园区', '1404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1405', '1405', '晋城市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140502', '140502', '城区', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140521', '140521', '沁水县', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140522', '140522', '阳城县', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140524', '140524', '陵川县', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140525', '140525', '泽州县', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140581', '140581', '高平市', '1405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1406', '1406', '朔州市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140602', '140602', '朔城区', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140603', '140603', '平鲁区', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140621', '140621', '山阴县', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140622', '140622', '应县', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140623', '140623', '右玉县', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140671', '140671', '山西朔州经济开发区', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140681', '140681', '怀仁市', '1406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1407', '1407', '晋中市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140702', '140702', '榆次区', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140703', '140703', '太谷区', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140721', '140721', '榆社县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140722', '140722', '左权县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140723', '140723', '和顺县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140724', '140724', '昔阳县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140725', '140725', '寿阳县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140727', '140727', '祁县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140728', '140728', '平遥县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140729', '140729', '灵石县', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140781', '140781', '介休市', '1407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1408', '1408', '运城市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140802', '140802', '盐湖区', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140821', '140821', '临猗县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140822', '140822', '万荣县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140823', '140823', '闻喜县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140824', '140824', '稷山县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140825', '140825', '新绛县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140826', '140826', '绛县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140827', '140827', '垣曲县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140828', '140828', '夏县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140829', '140829', '平陆县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140830', '140830', '芮城县', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140881', '140881', '永济市', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140882', '140882', '河津市', '1408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1409', '1409', '忻州市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140902', '140902', '忻府区', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140921', '140921', '定襄县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140922', '140922', '五台县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140923', '140923', '代县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140924', '140924', '繁峙县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140925', '140925', '宁武县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140926', '140926', '静乐县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140927', '140927', '神池县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140928', '140928', '五寨县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140929', '140929', '岢岚县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140930', '140930', '河曲县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140931', '140931', '保德县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140932', '140932', '偏关县', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140971', '140971', '五台山风景名胜区', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('140981', '140981', '原平市', '1409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1410', '1410', '临汾市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141002', '141002', '尧都区', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141021', '141021', '曲沃县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141022', '141022', '翼城县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141023', '141023', '襄汾县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141024', '141024', '洪洞县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141025', '141025', '古县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141026', '141026', '安泽县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141027', '141027', '浮山县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141028', '141028', '吉县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141029', '141029', '乡宁县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141030', '141030', '大宁县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141031', '141031', '隰县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141032', '141032', '永和县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141033', '141033', '蒲县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141034', '141034', '汾西县', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141081', '141081', '侯马市', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141082', '141082', '霍州市', '1410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1411', '1411', '吕梁市', '14', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141102', '141102', '离石区', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141121', '141121', '文水县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141122', '141122', '交城县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141123', '141123', '兴县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141124', '141124', '临县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141125', '141125', '柳林县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141126', '141126', '石楼县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141127', '141127', '岚县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141128', '141128', '方山县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141129', '141129', '中阳县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141130', '141130', '交口县', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141181', '141181', '孝义市', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('141182', '141182', '汾阳市', '1411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('15', '15', '内蒙古自治区', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1501', '1501', '呼和浩特市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150102', '150102', '新城区', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150103', '150103', '回民区', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150104', '150104', '玉泉区', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150105', '150105', '赛罕区', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150121', '150121', '土默特左旗', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150122', '150122', '托克托县', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150123', '150123', '和林格尔县', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150124', '150124', '清水河县', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150125', '150125', '武川县', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150172', '150172', '呼和浩特经济技术开发区', '1501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1502', '1502', '包头市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150202', '150202', '东河区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150203', '150203', '昆都仑区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150204', '150204', '青山区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150205', '150205', '石拐区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150206', '150206', '白云鄂博矿区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150207', '150207', '九原区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150221', '150221', '土默特右旗', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150222', '150222', '固阳县', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150223', '150223', '达尔罕茂明安联合旗', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150271', '150271', '包头稀土高新技术产业开发区', '1502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1503', '1503', '乌海市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150302', '150302', '海勃湾区', '1503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150303', '150303', '海南区', '1503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150304', '150304', '乌达区', '1503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1504', '1504', '赤峰市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150402', '150402', '红山区', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150403', '150403', '元宝山区', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150404', '150404', '松山区', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150421', '150421', '阿鲁科尔沁旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150422', '150422', '巴林左旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150423', '150423', '巴林右旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150424', '150424', '林西县', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150425', '150425', '克什克腾旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150426', '150426', '翁牛特旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150428', '150428', '喀喇沁旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150429', '150429', '宁城县', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150430', '150430', '敖汉旗', '1504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1505', '1505', '通辽市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150502', '150502', '科尔沁区', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150521', '150521', '科尔沁左翼中旗', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150522', '150522', '科尔沁左翼后旗', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150523', '150523', '开鲁县', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150524', '150524', '库伦旗', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150525', '150525', '奈曼旗', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150526', '150526', '扎鲁特旗', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150571', '150571', '通辽经济技术开发区', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150581', '150581', '霍林郭勒市', '1505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1506', '1506', '鄂尔多斯市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150602', '150602', '东胜区', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150603', '150603', '康巴什区', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150621', '150621', '达拉特旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150622', '150622', '准格尔旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150623', '150623', '鄂托克前旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150624', '150624', '鄂托克旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150625', '150625', '杭锦旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150626', '150626', '乌审旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150627', '150627', '伊金霍洛旗', '1506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1507', '1507', '呼伦贝尔市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150702', '150702', '海拉尔区', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150703', '150703', '扎赉诺尔区', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150721', '150721', '阿荣旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150722', '150722', '莫力达瓦达斡尔族自治旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150723', '150723', '鄂伦春自治旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150724', '150724', '鄂温克族自治旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150725', '150725', '陈巴尔虎旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150726', '150726', '新巴尔虎左旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150727', '150727', '新巴尔虎右旗', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150781', '150781', '满洲里市', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150782', '150782', '牙克石市', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150783', '150783', '扎兰屯市', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150784', '150784', '额尔古纳市', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150785', '150785', '根河市', '1507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1508', '1508', '巴彦淖尔市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150802', '150802', '临河区', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150821', '150821', '五原县', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150822', '150822', '磴口县', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150823', '150823', '乌拉特前旗', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150824', '150824', '乌拉特中旗', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150825', '150825', '乌拉特后旗', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150826', '150826', '杭锦后旗', '1508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1509', '1509', '乌兰察布市', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150902', '150902', '集宁区', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150921', '150921', '卓资县', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150922', '150922', '化德县', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150923', '150923', '商都县', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150924', '150924', '兴和县', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150925', '150925', '凉城县', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150926', '150926', '察哈尔右翼前旗', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150927', '150927', '察哈尔右翼中旗', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150928', '150928', '察哈尔右翼后旗', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150929', '150929', '四子王旗', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('150981', '150981', '丰镇市', '1509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1522', '1522', '兴安盟', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152201', '152201', '乌兰浩特市', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152202', '152202', '阿尔山市', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152221', '152221', '科尔沁右翼前旗', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152222', '152222', '科尔沁右翼中旗', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152223', '152223', '扎赉特旗', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152224', '152224', '突泉县', '1522', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1525', '1525', '锡林郭勒盟', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152501', '152501', '二连浩特市', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152502', '152502', '锡林浩特市', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152522', '152522', '阿巴嘎旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152523', '152523', '苏尼特左旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152524', '152524', '苏尼特右旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152525', '152525', '东乌珠穆沁旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152526', '152526', '西乌珠穆沁旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152527', '152527', '太仆寺旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152528', '152528', '镶黄旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152529', '152529', '正镶白旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152530', '152530', '正蓝旗', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152531', '152531', '多伦县', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152571', '152571', '乌拉盖管委会', '1525', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('1529', '1529', '阿拉善盟', '15', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152921', '152921', '阿拉善左旗', '1529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152922', '152922', '阿拉善右旗', '1529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152923', '152923', '额济纳旗', '1529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('152971', '152971', '内蒙古阿拉善经济开发区', '1529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('21', '21', '辽宁省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2101', '2101', '沈阳市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210102', '210102', '和平区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210103', '210103', '沈河区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210104', '210104', '大东区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210105', '210105', '皇姑区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210106', '210106', '铁西区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210111', '210111', '苏家屯区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210112', '210112', '浑南区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210113', '210113', '沈北新区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210114', '210114', '于洪区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210115', '210115', '辽中区', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210123', '210123', '康平县', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210124', '210124', '法库县', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210181', '210181', '新民市', '2101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2102', '2102', '大连市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210202', '210202', '中山区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210203', '210203', '西岗区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210204', '210204', '沙河口区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210211', '210211', '甘井子区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210212', '210212', '旅顺口区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210213', '210213', '金州区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210214', '210214', '普兰店区', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210224', '210224', '长海县', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210281', '210281', '瓦房店市', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210283', '210283', '庄河市', '2102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2103', '2103', '鞍山市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210302', '210302', '铁东区', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210303', '210303', '铁西区', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210304', '210304', '立山区', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210311', '210311', '千山区', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210321', '210321', '台安县', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210323', '210323', '岫岩满族自治县', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210381', '210381', '海城市', '2103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2104', '2104', '抚顺市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210402', '210402', '新抚区', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210403', '210403', '东洲区', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210404', '210404', '望花区', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210411', '210411', '顺城区', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210421', '210421', '抚顺县', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210422', '210422', '新宾满族自治县', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210423', '210423', '清原满族自治县', '2104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2105', '2105', '本溪市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210502', '210502', '平山区', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210503', '210503', '溪湖区', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210504', '210504', '明山区', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210505', '210505', '南芬区', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210521', '210521', '本溪满族自治县', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210522', '210522', '桓仁满族自治县', '2105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2106', '2106', '丹东市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210602', '210602', '元宝区', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210603', '210603', '振兴区', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210604', '210604', '振安区', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210624', '210624', '宽甸满族自治县', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210681', '210681', '东港市', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210682', '210682', '凤城市', '2106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2107', '2107', '锦州市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210702', '210702', '古塔区', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210703', '210703', '凌河区', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210711', '210711', '太和区', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210726', '210726', '黑山县', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210727', '210727', '义县', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210781', '210781', '凌海市', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210782', '210782', '北镇市', '2107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2108', '2108', '营口市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210802', '210802', '站前区', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210803', '210803', '西市区', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210804', '210804', '鲅鱼圈区', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210811', '210811', '老边区', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210881', '210881', '盖州市', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210882', '210882', '大石桥市', '2108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2109', '2109', '阜新市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210902', '210902', '海州区', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210903', '210903', '新邱区', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210904', '210904', '太平区', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210905', '210905', '清河门区', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210911', '210911', '细河区', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210921', '210921', '阜新蒙古族自治县', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('210922', '210922', '彰武县', '2109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2110', '2110', '辽阳市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211002', '211002', '白塔区', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211003', '211003', '文圣区', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211004', '211004', '宏伟区', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211005', '211005', '弓长岭区', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211011', '211011', '太子河区', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211021', '211021', '辽阳县', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211081', '211081', '灯塔市', '2110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2111', '2111', '盘锦市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211102', '211102', '双台子区', '2111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211103', '211103', '兴隆台区', '2111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211104', '211104', '大洼区', '2111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211122', '211122', '盘山县', '2111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2112', '2112', '铁岭市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211202', '211202', '银州区', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211204', '211204', '清河区', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211221', '211221', '铁岭县', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211223', '211223', '西丰县', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211224', '211224', '昌图县', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211281', '211281', '调兵山市', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211282', '211282', '开原市', '2112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2113', '2113', '朝阳市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211302', '211302', '双塔区', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211303', '211303', '龙城区', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211321', '211321', '朝阳县', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211322', '211322', '建平县', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211324', '211324', '喀喇沁左翼蒙古族自治县', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211381', '211381', '北票市', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211382', '211382', '凌源市', '2113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2114', '2114', '葫芦岛市', '21', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211402', '211402', '连山区', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211403', '211403', '龙港区', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211404', '211404', '南票区', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211421', '211421', '绥中县', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211422', '211422', '建昌县', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('211481', '211481', '兴城市', '2114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('22', '22', '吉林省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2201', '2201', '长春市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220102', '220102', '南关区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220103', '220103', '宽城区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220104', '220104', '朝阳区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220105', '220105', '二道区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220106', '220106', '绿园区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220112', '220112', '双阳区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220113', '220113', '九台区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220122', '220122', '农安县', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220171', '220171', '长春经济技术开发区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220172', '220172', '长春净月高新技术产业开发区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220173', '220173', '长春高新技术产业开发区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220174', '220174', '长春汽车经济技术开发区', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220182', '220182', '榆树市', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220183', '220183', '德惠市', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220184', '220184', '公主岭市', '2201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2202', '2202', '吉林市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220202', '220202', '昌邑区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220203', '220203', '龙潭区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220204', '220204', '船营区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220211', '220211', '丰满区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220221', '220221', '永吉县', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220271', '220271', '吉林经济开发区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220272', '220272', '吉林高新技术产业开发区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220273', '220273', '吉林中国新加坡食品区', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220281', '220281', '蛟河市', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220282', '220282', '桦甸市', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220283', '220283', '舒兰市', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220284', '220284', '磐石市', '2202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2203', '2203', '四平市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220302', '220302', '铁西区', '2203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220303', '220303', '铁东区', '2203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220322', '220322', '梨树县', '2203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220323', '220323', '伊通满族自治县', '2203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220382', '220382', '双辽市', '2203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2204', '2204', '辽源市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220402', '220402', '龙山区', '2204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220403', '220403', '西安区', '2204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220421', '220421', '东丰县', '2204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220422', '220422', '东辽县', '2204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2205', '2205', '通化市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220502', '220502', '东昌区', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220503', '220503', '二道江区', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220521', '220521', '通化县', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220523', '220523', '辉南县', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220524', '220524', '柳河县', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220581', '220581', '梅河口市', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220582', '220582', '集安市', '2205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2206', '2206', '白山市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220602', '220602', '浑江区', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220605', '220605', '江源区', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220621', '220621', '抚松县', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220622', '220622', '靖宇县', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220623', '220623', '长白朝鲜族自治县', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220681', '220681', '临江市', '2206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2207', '2207', '松原市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220702', '220702', '宁江区', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220721', '220721', '前郭尔罗斯蒙古族自治县', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220722', '220722', '长岭县', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220723', '220723', '乾安县', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220771', '220771', '吉林松原经济开发区', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220781', '220781', '扶余市', '2207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2208', '2208', '白城市', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220802', '220802', '洮北区', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220821', '220821', '镇赉县', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220822', '220822', '通榆县', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220871', '220871', '吉林白城经济开发区', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220881', '220881', '洮南市', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('220882', '220882', '大安市', '2208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2224', '2224', '延边朝鲜族自治州', '22', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222401', '222401', '延吉市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222402', '222402', '图们市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222403', '222403', '敦化市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222404', '222404', '珲春市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222405', '222405', '龙井市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222406', '222406', '和龙市', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222424', '222424', '汪清县', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('222426', '222426', '安图县', '2224', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('23', '23', '黑龙江省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2301', '2301', '哈尔滨市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230102', '230102', '道里区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230103', '230103', '南岗区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230104', '230104', '道外区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230108', '230108', '平房区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230109', '230109', '松北区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230110', '230110', '香坊区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230111', '230111', '呼兰区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230112', '230112', '阿城区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230113', '230113', '双城区', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230123', '230123', '依兰县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230124', '230124', '方正县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230125', '230125', '宾县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230126', '230126', '巴彦县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230127', '230127', '木兰县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230128', '230128', '通河县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230129', '230129', '延寿县', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230183', '230183', '尚志市', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230184', '230184', '五常市', '2301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2302', '2302', '齐齐哈尔市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230202', '230202', '龙沙区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230203', '230203', '建华区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230204', '230204', '铁锋区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230205', '230205', '昂昂溪区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230206', '230206', '富拉尔基区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230207', '230207', '碾子山区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230208', '230208', '梅里斯达斡尔族区', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230221', '230221', '龙江县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230223', '230223', '依安县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230224', '230224', '泰来县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230225', '230225', '甘南县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230227', '230227', '富裕县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230229', '230229', '克山县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230230', '230230', '克东县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230231', '230231', '拜泉县', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230281', '230281', '讷河市', '2302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2303', '2303', '鸡西市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230302', '230302', '鸡冠区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230303', '230303', '恒山区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230304', '230304', '滴道区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230305', '230305', '梨树区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230306', '230306', '城子河区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230307', '230307', '麻山区', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230321', '230321', '鸡东县', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230381', '230381', '虎林市', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230382', '230382', '密山市', '2303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2304', '2304', '鹤岗市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230402', '230402', '向阳区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230403', '230403', '工农区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230404', '230404', '南山区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230405', '230405', '兴安区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230406', '230406', '东山区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230407', '230407', '兴山区', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230421', '230421', '萝北县', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230422', '230422', '绥滨县', '2304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2305', '2305', '双鸭山市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230502', '230502', '尖山区', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230503', '230503', '岭东区', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230505', '230505', '四方台区', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230506', '230506', '宝山区', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230521', '230521', '集贤县', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230522', '230522', '友谊县', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230523', '230523', '宝清县', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230524', '230524', '饶河县', '2305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2306', '2306', '大庆市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230602', '230602', '萨尔图区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230603', '230603', '龙凤区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230604', '230604', '让胡路区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230605', '230605', '红岗区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230606', '230606', '大同区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230621', '230621', '肇州县', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230622', '230622', '肇源县', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230623', '230623', '林甸县', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230624', '230624', '杜尔伯特蒙古族自治县', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230671', '230671', '大庆高新技术产业开发区', '2306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2307', '2307', '伊春市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230717', '230717', '伊美区', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230718', '230718', '乌翠区', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230719', '230719', '友好区', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230722', '230722', '嘉荫县', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230723', '230723', '汤旺县', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230724', '230724', '丰林县', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230725', '230725', '大箐山县', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230726', '230726', '南岔县', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230751', '230751', '金林区', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230781', '230781', '铁力市', '2307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2308', '2308', '佳木斯市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230803', '230803', '向阳区', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230804', '230804', '前进区', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230805', '230805', '东风区', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230811', '230811', '郊区', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230822', '230822', '桦南县', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230826', '230826', '桦川县', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230828', '230828', '汤原县', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230881', '230881', '同江市', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230882', '230882', '富锦市', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230883', '230883', '抚远市', '2308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2309', '2309', '七台河市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230902', '230902', '新兴区', '2309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230903', '230903', '桃山区', '2309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230904', '230904', '茄子河区', '2309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('230921', '230921', '勃利县', '2309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2310', '2310', '牡丹江市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231002', '231002', '东安区', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231003', '231003', '阳明区', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231004', '231004', '爱民区', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231005', '231005', '西安区', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231025', '231025', '林口县', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231071', '231071', '牡丹江经济技术开发区', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231081', '231081', '绥芬河市', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231083', '231083', '海林市', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231084', '231084', '宁安市', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231085', '231085', '穆棱市', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231086', '231086', '东宁市', '2310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2311', '2311', '黑河市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231102', '231102', '爱辉区', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231123', '231123', '逊克县', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231124', '231124', '孙吴县', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231181', '231181', '北安市', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231182', '231182', '五大连池市', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231183', '231183', '嫩江市', '2311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2312', '2312', '绥化市', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231202', '231202', '北林区', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231221', '231221', '望奎县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231222', '231222', '兰西县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231223', '231223', '青冈县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231224', '231224', '庆安县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231225', '231225', '明水县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231226', '231226', '绥棱县', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231281', '231281', '安达市', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231282', '231282', '肇东市', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('231283', '231283', '海伦市', '2312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('2327', '2327', '大兴安岭地区', '23', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232701', '232701', '漠河市', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232721', '232721', '呼玛县', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232722', '232722', '塔河县', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232761', '232761', '加格达奇区', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232762', '232762', '松岭区', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232763', '232763', '新林区', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('232764', '232764', '呼中区', '2327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('31', '31', '上海市', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3101', '3101', '市辖区', '31', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310101', '310101', '黄浦区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310104', '310104', '徐汇区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310105', '310105', '长宁区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310106', '310106', '静安区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310107', '310107', '普陀区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310109', '310109', '虹口区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310110', '310110', '杨浦区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310112', '310112', '闵行区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310113', '310113', '宝山区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310114', '310114', '嘉定区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310115', '310115', '浦东新区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310116', '310116', '金山区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310117', '310117', '松江区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310118', '310118', '青浦区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310120', '310120', '奉贤区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('310151', '310151', '崇明区', '3101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('32', '32', '江苏省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3201', '3201', '南京市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320102', '320102', '玄武区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320104', '320104', '秦淮区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320105', '320105', '建邺区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320106', '320106', '鼓楼区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320111', '320111', '浦口区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320113', '320113', '栖霞区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320114', '320114', '雨花台区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320115', '320115', '江宁区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320116', '320116', '六合区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320117', '320117', '溧水区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320118', '320118', '高淳区', '3201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3202', '3202', '无锡市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320205', '320205', '锡山区', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320206', '320206', '惠山区', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320211', '320211', '滨湖区', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320213', '320213', '梁溪区', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320214', '320214', '新吴区', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320281', '320281', '江阴市', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320282', '320282', '宜兴市', '3202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3203', '3203', '徐州市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320302', '320302', '鼓楼区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320303', '320303', '云龙区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320305', '320305', '贾汪区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320311', '320311', '泉山区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320312', '320312', '铜山区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320321', '320321', '丰县', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320322', '320322', '沛县', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320324', '320324', '睢宁县', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320371', '320371', '徐州经济技术开发区', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320381', '320381', '新沂市', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320382', '320382', '邳州市', '3203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3204', '3204', '常州市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320402', '320402', '天宁区', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320404', '320404', '钟楼区', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320411', '320411', '新北区', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320412', '320412', '武进区', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320413', '320413', '金坛区', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320481', '320481', '溧阳市', '3204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3205', '3205', '苏州市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320505', '320505', '虎丘区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320506', '320506', '吴中区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320507', '320507', '相城区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320508', '320508', '姑苏区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320509', '320509', '吴江区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320571', '320571', '苏州工业园区', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320581', '320581', '常熟市', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320582', '320582', '张家港市', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320583', '320583', '昆山市', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320585', '320585', '太仓市', '3205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3206', '3206', '南通市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320602', '320602', '崇川区', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320611', '320611', '港闸区', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320612', '320612', '通州区', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320623', '320623', '如东县', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320671', '320671', '南通经济技术开发区', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320681', '320681', '启东市', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320682', '320682', '如皋市', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320684', '320684', '海门市', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320685', '320685', '海安市', '3206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3207', '3207', '连云港市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320703', '320703', '连云区', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320706', '320706', '海州区', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320707', '320707', '赣榆区', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320722', '320722', '东海县', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320723', '320723', '灌云县', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320724', '320724', '灌南县', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320771', '320771', '连云港经济技术开发区', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320772', '320772', '连云港高新技术产业开发区', '3207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3208', '3208', '淮安市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320803', '320803', '淮安区', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320804', '320804', '淮阴区', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320812', '320812', '清江浦区', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320813', '320813', '洪泽区', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320826', '320826', '涟水县', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320830', '320830', '盱眙县', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320831', '320831', '金湖县', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320871', '320871', '淮安经济技术开发区', '3208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3209', '3209', '盐城市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320902', '320902', '亭湖区', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320903', '320903', '盐都区', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320904', '320904', '大丰区', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320921', '320921', '响水县', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320922', '320922', '滨海县', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320923', '320923', '阜宁县', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320924', '320924', '射阳县', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320925', '320925', '建湖县', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320971', '320971', '盐城经济技术开发区', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('320981', '320981', '东台市', '3209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3210', '3210', '扬州市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321002', '321002', '广陵区', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321003', '321003', '邗江区', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321012', '321012', '江都区', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321023', '321023', '宝应县', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321071', '321071', '扬州经济技术开发区', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321081', '321081', '仪征市', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321084', '321084', '高邮市', '3210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3211', '3211', '镇江市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321102', '321102', '京口区', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321111', '321111', '润州区', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321112', '321112', '丹徒区', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321171', '321171', '镇江新区', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321181', '321181', '丹阳市', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321182', '321182', '扬中市', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321183', '321183', '句容市', '3211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3212', '3212', '泰州市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321202', '321202', '海陵区', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321203', '321203', '高港区', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321204', '321204', '姜堰区', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321271', '321271', '泰州医药高新技术产业开发区', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321281', '321281', '兴化市', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321282', '321282', '靖江市', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321283', '321283', '泰兴市', '3212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3213', '3213', '宿迁市', '32', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321302', '321302', '宿城区', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321311', '321311', '宿豫区', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321322', '321322', '沭阳县', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321323', '321323', '泗阳县', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321324', '321324', '泗洪县', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('321371', '321371', '宿迁经济技术开发区', '3213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('33', '33', '浙江省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3301', '3301', '杭州市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330102', '330102', '上城区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330103', '330103', '下城区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330104', '330104', '江干区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330105', '330105', '拱墅区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330106', '330106', '西湖区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330108', '330108', '滨江区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330109', '330109', '萧山区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330110', '330110', '余杭区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330111', '330111', '富阳区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330112', '330112', '临安区', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330122', '330122', '桐庐县', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330127', '330127', '淳安县', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330182', '330182', '建德市', '3301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3302', '3302', '宁波市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330203', '330203', '海曙区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330205', '330205', '江北区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330206', '330206', '北仑区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330211', '330211', '镇海区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330212', '330212', '鄞州区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330213', '330213', '奉化区', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330225', '330225', '象山县', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330226', '330226', '宁海县', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330281', '330281', '余姚市', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330282', '330282', '慈溪市', '3302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3303', '3303', '温州市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330302', '330302', '鹿城区', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330303', '330303', '龙湾区', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330304', '330304', '瓯海区', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330305', '330305', '洞头区', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330324', '330324', '永嘉县', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330326', '330326', '平阳县', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330327', '330327', '苍南县', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330328', '330328', '文成县', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330329', '330329', '泰顺县', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330371', '330371', '温州经济技术开发区', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330381', '330381', '瑞安市', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330382', '330382', '乐清市', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330383', '330383', '龙港市', '3303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3304', '3304', '嘉兴市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330402', '330402', '南湖区', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330411', '330411', '秀洲区', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330421', '330421', '嘉善县', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330424', '330424', '海盐县', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330481', '330481', '海宁市', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330482', '330482', '平湖市', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330483', '330483', '桐乡市', '3304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3305', '3305', '湖州市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330502', '330502', '吴兴区', '3305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330503', '330503', '南浔区', '3305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330521', '330521', '德清县', '3305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330522', '330522', '长兴县', '3305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330523', '330523', '安吉县', '3305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3306', '3306', '绍兴市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330602', '330602', '越城区', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330603', '330603', '柯桥区', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330604', '330604', '上虞区', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330624', '330624', '新昌县', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330681', '330681', '诸暨市', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330683', '330683', '嵊州市', '3306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3307', '3307', '金华市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330702', '330702', '婺城区', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330703', '330703', '金东区', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330723', '330723', '武义县', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330726', '330726', '浦江县', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330727', '330727', '磐安县', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330781', '330781', '兰溪市', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330782', '330782', '义乌市', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330783', '330783', '东阳市', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330784', '330784', '永康市', '3307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3308', '3308', '衢州市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330802', '330802', '柯城区', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330803', '330803', '衢江区', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330822', '330822', '常山县', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330824', '330824', '开化县', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330825', '330825', '龙游县', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330881', '330881', '江山市', '3308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3309', '3309', '舟山市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330902', '330902', '定海区', '3309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330903', '330903', '普陀区', '3309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330921', '330921', '岱山县', '3309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('330922', '330922', '嵊泗县', '3309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3310', '3310', '台州市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331002', '331002', '椒江区', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331003', '331003', '黄岩区', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331004', '331004', '路桥区', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331022', '331022', '三门县', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331023', '331023', '天台县', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331024', '331024', '仙居县', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331081', '331081', '温岭市', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331082', '331082', '临海市', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331083', '331083', '玉环市', '3310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3311', '3311', '丽水市', '33', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331102', '331102', '莲都区', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331121', '331121', '青田县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331122', '331122', '缙云县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331123', '331123', '遂昌县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331124', '331124', '松阳县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331125', '331125', '云和县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331126', '331126', '庆元县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331127', '331127', '景宁畲族自治县', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('331181', '331181', '龙泉市', '3311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('34', '34', '安徽省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3401', '3401', '合肥市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340102', '340102', '瑶海区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340103', '340103', '庐阳区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340104', '340104', '蜀山区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340111', '340111', '包河区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340121', '340121', '长丰县', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340122', '340122', '肥东县', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340123', '340123', '肥西县', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340124', '340124', '庐江县', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340171', '340171', '合肥高新技术产业开发区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340172', '340172', '合肥经济技术开发区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340173', '340173', '合肥新站高新技术产业开发区', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340181', '340181', '巢湖市', '3401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3402', '3402', '芜湖市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340202', '340202', '镜湖区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340203', '340203', '弋江区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340207', '340207', '鸠江区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340208', '340208', '三山区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340221', '340221', '芜湖县', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340222', '340222', '繁昌县', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340223', '340223', '南陵县', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340271', '340271', '芜湖经济技术开发区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340272', '340272', '安徽芜湖长江大桥经济开发区', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340281', '340281', '无为市', '3402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3403', '3403', '蚌埠市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340302', '340302', '龙子湖区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340303', '340303', '蚌山区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340304', '340304', '禹会区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340311', '340311', '淮上区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340321', '340321', '怀远县', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340322', '340322', '五河县', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340323', '340323', '固镇县', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340371', '340371', '蚌埠市高新技术开发区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340372', '340372', '蚌埠市经济开发区', '3403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3404', '3404', '淮南市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340402', '340402', '大通区', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340403', '340403', '田家庵区', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340404', '340404', '谢家集区', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340405', '340405', '八公山区', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340406', '340406', '潘集区', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340421', '340421', '凤台县', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340422', '340422', '寿县', '3404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3405', '3405', '马鞍山市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340503', '340503', '花山区', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340504', '340504', '雨山区', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340506', '340506', '博望区', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340521', '340521', '当涂县', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340522', '340522', '含山县', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340523', '340523', '和县', '3405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3406', '3406', '淮北市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340602', '340602', '杜集区', '3406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340603', '340603', '相山区', '3406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340604', '340604', '烈山区', '3406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340621', '340621', '濉溪县', '3406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3407', '3407', '铜陵市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340705', '340705', '铜官区', '3407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340706', '340706', '义安区', '3407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340711', '340711', '郊区', '3407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340722', '340722', '枞阳县', '3407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3408', '3408', '安庆市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340802', '340802', '迎江区', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340803', '340803', '大观区', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340811', '340811', '宜秀区', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340822', '340822', '怀宁县', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340825', '340825', '太湖县', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340826', '340826', '宿松县', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340827', '340827', '望江县', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340828', '340828', '岳西县', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340871', '340871', '安徽安庆经济开发区', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340881', '340881', '桐城市', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('340882', '340882', '潜山市', '3408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3410', '3410', '黄山市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341002', '341002', '屯溪区', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341003', '341003', '黄山区', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341004', '341004', '徽州区', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341021', '341021', '歙县', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341022', '341022', '休宁县', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341023', '341023', '黟县', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341024', '341024', '祁门县', '3410', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3411', '3411', '滁州市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341102', '341102', '琅琊区', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341103', '341103', '南谯区', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341122', '341122', '来安县', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341124', '341124', '全椒县', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341125', '341125', '定远县', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341126', '341126', '凤阳县', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341171', '341171', '苏滁现代产业园', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341172', '341172', '滁州经济技术开发区', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341181', '341181', '天长市', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341182', '341182', '明光市', '3411', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3412', '3412', '阜阳市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341202', '341202', '颍州区', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341203', '341203', '颍东区', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341204', '341204', '颍泉区', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341221', '341221', '临泉县', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341222', '341222', '太和县', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341225', '341225', '阜南县', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341226', '341226', '颍上县', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341271', '341271', '阜阳合肥现代产业园区', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341272', '341272', '阜阳经济技术开发区', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341282', '341282', '界首市', '3412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3413', '3413', '宿州市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341302', '341302', '埇桥区', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341321', '341321', '砀山县', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341322', '341322', '萧县', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341323', '341323', '灵璧县', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341324', '341324', '泗县', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341371', '341371', '宿州马鞍山现代产业园区', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341372', '341372', '宿州经济技术开发区', '3413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3415', '3415', '六安市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341502', '341502', '金安区', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341503', '341503', '裕安区', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341504', '341504', '叶集区', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341522', '341522', '霍邱县', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341523', '341523', '舒城县', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341524', '341524', '金寨县', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341525', '341525', '霍山县', '3415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3416', '3416', '亳州市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341602', '341602', '谯城区', '3416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341621', '341621', '涡阳县', '3416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341622', '341622', '蒙城县', '3416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341623', '341623', '利辛县', '3416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3417', '3417', '池州市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341702', '341702', '贵池区', '3417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341721', '341721', '东至县', '3417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341722', '341722', '石台县', '3417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341723', '341723', '青阳县', '3417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3418', '3418', '宣城市', '34', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341802', '341802', '宣州区', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341821', '341821', '郎溪县', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341823', '341823', '泾县', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341824', '341824', '绩溪县', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341825', '341825', '旌德县', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341871', '341871', '宣城市经济开发区', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341881', '341881', '宁国市', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('341882', '341882', '广德市', '3418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('35', '35', '福建省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3501', '3501', '福州市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350102', '350102', '鼓楼区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350103', '350103', '台江区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350104', '350104', '仓山区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350105', '350105', '马尾区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350111', '350111', '晋安区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350112', '350112', '长乐区', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350121', '350121', '闽侯县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350122', '350122', '连江县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350123', '350123', '罗源县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350124', '350124', '闽清县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350125', '350125', '永泰县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350128', '350128', '平潭县', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350181', '350181', '福清市', '3501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3502', '3502', '厦门市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350203', '350203', '思明区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350205', '350205', '海沧区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350206', '350206', '湖里区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350211', '350211', '集美区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350212', '350212', '同安区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350213', '350213', '翔安区', '3502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3503', '3503', '莆田市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350302', '350302', '城厢区', '3503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350303', '350303', '涵江区', '3503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350304', '350304', '荔城区', '3503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350305', '350305', '秀屿区', '3503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350322', '350322', '仙游县', '3503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3504', '3504', '三明市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350402', '350402', '梅列区', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350403', '350403', '三元区', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350421', '350421', '明溪县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350423', '350423', '清流县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350424', '350424', '宁化县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350425', '350425', '大田县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350426', '350426', '尤溪县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350427', '350427', '沙县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350428', '350428', '将乐县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350429', '350429', '泰宁县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350430', '350430', '建宁县', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350481', '350481', '永安市', '3504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3505', '3505', '泉州市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350502', '350502', '鲤城区', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350503', '350503', '丰泽区', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350504', '350504', '洛江区', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350505', '350505', '泉港区', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350521', '350521', '惠安县', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350524', '350524', '安溪县', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350525', '350525', '永春县', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350526', '350526', '德化县', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350527', '350527', '金门县', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350581', '350581', '石狮市', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350582', '350582', '晋江市', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350583', '350583', '南安市', '3505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3506', '3506', '漳州市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350602', '350602', '芗城区', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350603', '350603', '龙文区', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350622', '350622', '云霄县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350623', '350623', '漳浦县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350624', '350624', '诏安县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350625', '350625', '长泰县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350626', '350626', '东山县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350627', '350627', '南靖县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350628', '350628', '平和县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350629', '350629', '华安县', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350681', '350681', '龙海市', '3506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3507', '3507', '南平市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350702', '350702', '延平区', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350703', '350703', '建阳区', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350721', '350721', '顺昌县', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350722', '350722', '浦城县', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350723', '350723', '光泽县', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350724', '350724', '松溪县', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350725', '350725', '政和县', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350781', '350781', '邵武市', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350782', '350782', '武夷山市', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350783', '350783', '建瓯市', '3507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3508', '3508', '龙岩市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350802', '350802', '新罗区', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350803', '350803', '永定区', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350821', '350821', '长汀县', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350823', '350823', '上杭县', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350824', '350824', '武平县', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350825', '350825', '连城县', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350881', '350881', '漳平市', '3508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3509', '3509', '宁德市', '35', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350902', '350902', '蕉城区', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350921', '350921', '霞浦县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350922', '350922', '古田县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350923', '350923', '屏南县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350924', '350924', '寿宁县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350925', '350925', '周宁县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350926', '350926', '柘荣县', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350981', '350981', '福安市', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('350982', '350982', '福鼎市', '3509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('36', '36', '江西省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3601', '3601', '南昌市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360102', '360102', '东湖区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360103', '360103', '西湖区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360104', '360104', '青云谱区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360111', '360111', '青山湖区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360112', '360112', '新建区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360113', '360113', '红谷滩区', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360121', '360121', '南昌县', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360123', '360123', '安义县', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360124', '360124', '进贤县', '3601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3602', '3602', '景德镇市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360202', '360202', '昌江区', '3602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360203', '360203', '珠山区', '3602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360222', '360222', '浮梁县', '3602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360281', '360281', '乐平市', '3602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3603', '3603', '萍乡市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360302', '360302', '安源区', '3603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360313', '360313', '湘东区', '3603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360321', '360321', '莲花县', '3603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360322', '360322', '上栗县', '3603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360323', '360323', '芦溪县', '3603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3604', '3604', '九江市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360402', '360402', '濂溪区', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360403', '360403', '浔阳区', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360404', '360404', '柴桑区', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360423', '360423', '武宁县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360424', '360424', '修水县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360425', '360425', '永修县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360426', '360426', '德安县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360428', '360428', '都昌县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360429', '360429', '湖口县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360430', '360430', '彭泽县', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360481', '360481', '瑞昌市', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360482', '360482', '共青城市', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360483', '360483', '庐山市', '3604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3605', '3605', '新余市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360502', '360502', '渝水区', '3605', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360521', '360521', '分宜县', '3605', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3606', '3606', '鹰潭市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360602', '360602', '月湖区', '3606', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360603', '360603', '余江区', '3606', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360681', '360681', '贵溪市', '3606', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3607', '3607', '赣州市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360702', '360702', '章贡区', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360703', '360703', '南康区', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360704', '360704', '赣县区', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360722', '360722', '信丰县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360723', '360723', '大余县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360724', '360724', '上犹县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360725', '360725', '崇义县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360726', '360726', '安远县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360728', '360728', '定南县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360729', '360729', '全南县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360730', '360730', '宁都县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360731', '360731', '于都县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360732', '360732', '兴国县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360733', '360733', '会昌县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360734', '360734', '寻乌县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360735', '360735', '石城县', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360781', '360781', '瑞金市', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360783', '360783', '龙南市', '3607', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3608', '3608', '吉安市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360802', '360802', '吉州区', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360803', '360803', '青原区', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360821', '360821', '吉安县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360822', '360822', '吉水县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360823', '360823', '峡江县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360824', '360824', '新干县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360825', '360825', '永丰县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360826', '360826', '泰和县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360827', '360827', '遂川县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360828', '360828', '万安县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360829', '360829', '安福县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360830', '360830', '永新县', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360881', '360881', '井冈山市', '3608', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3609', '3609', '宜春市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360902', '360902', '袁州区', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360921', '360921', '奉新县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360922', '360922', '万载县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360923', '360923', '上高县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360924', '360924', '宜丰县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360925', '360925', '靖安县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360926', '360926', '铜鼓县', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360981', '360981', '丰城市', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360982', '360982', '樟树市', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('360983', '360983', '高安市', '3609', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3610', '3610', '抚州市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361002', '361002', '临川区', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361003', '361003', '东乡区', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361021', '361021', '南城县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361022', '361022', '黎川县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361023', '361023', '南丰县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361024', '361024', '崇仁县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361025', '361025', '乐安县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361026', '361026', '宜黄县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361027', '361027', '金溪县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361028', '361028', '资溪县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361030', '361030', '广昌县', '3610', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3611', '3611', '上饶市', '36', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361102', '361102', '信州区', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361103', '361103', '广丰区', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361104', '361104', '广信区', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361123', '361123', '玉山县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361124', '361124', '铅山县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361125', '361125', '横峰县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361126', '361126', '弋阳县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361127', '361127', '余干县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361128', '361128', '鄱阳县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361129', '361129', '万年县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361130', '361130', '婺源县', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('361181', '361181', '德兴市', '3611', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('37', '37', '山东省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3701', '3701', '济南市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370102', '370102', '历下区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370103', '370103', '市中区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370104', '370104', '槐荫区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370105', '370105', '天桥区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370112', '370112', '历城区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370113', '370113', '长清区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370114', '370114', '章丘区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370115', '370115', '济阳区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370116', '370116', '莱芜区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370117', '370117', '钢城区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370124', '370124', '平阴县', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370126', '370126', '商河县', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370171', '370171', '济南高新技术产业开发区', '3701', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3702', '3702', '青岛市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370202', '370202', '市南区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370203', '370203', '市北区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370211', '370211', '黄岛区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370212', '370212', '崂山区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370213', '370213', '李沧区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370214', '370214', '城阳区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370215', '370215', '即墨区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370271', '370271', '青岛高新技术产业开发区', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370281', '370281', '胶州市', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370283', '370283', '平度市', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370285', '370285', '莱西市', '3702', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3703', '3703', '淄博市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370302', '370302', '淄川区', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370303', '370303', '张店区', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370304', '370304', '博山区', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370305', '370305', '临淄区', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370306', '370306', '周村区', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370321', '370321', '桓台县', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370322', '370322', '高青县', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370323', '370323', '沂源县', '3703', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3704', '3704', '枣庄市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370402', '370402', '市中区', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370403', '370403', '薛城区', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370404', '370404', '峄城区', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370405', '370405', '台儿庄区', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370406', '370406', '山亭区', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370481', '370481', '滕州市', '3704', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3705', '3705', '东营市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370502', '370502', '东营区', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370503', '370503', '河口区', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370505', '370505', '垦利区', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370522', '370522', '利津县', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370523', '370523', '广饶县', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370571', '370571', '东营经济技术开发区', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370572', '370572', '东营港经济开发区', '3705', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3706', '3706', '烟台市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370602', '370602', '芝罘区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370611', '370611', '福山区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370612', '370612', '牟平区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370613', '370613', '莱山区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370614', '370614', '蓬莱区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370671', '370671', '烟台高新技术产业开发区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370672', '370672', '烟台经济技术开发区', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370681', '370681', '龙口市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370682', '370682', '莱阳市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370683', '370683', '莱州市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370685', '370685', '招远市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370686', '370686', '栖霞市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370687', '370687', '海阳市', '3706', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3707', '3707', '潍坊市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370702', '370702', '潍城区', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370703', '370703', '寒亭区', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370704', '370704', '坊子区', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370705', '370705', '奎文区', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370724', '370724', '临朐县', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370725', '370725', '昌乐县', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370772', '370772', '潍坊滨海经济技术开发区', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370781', '370781', '青州市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370782', '370782', '诸城市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370783', '370783', '寿光市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370784', '370784', '安丘市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370785', '370785', '高密市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370786', '370786', '昌邑市', '3707', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3708', '3708', '济宁市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370811', '370811', '任城区', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370812', '370812', '兖州区', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370826', '370826', '微山县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370827', '370827', '鱼台县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370828', '370828', '金乡县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370829', '370829', '嘉祥县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370830', '370830', '汶上县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370831', '370831', '泗水县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370832', '370832', '梁山县', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370871', '370871', '济宁高新技术产业开发区', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370881', '370881', '曲阜市', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370883', '370883', '邹城市', '3708', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3709', '3709', '泰安市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370902', '370902', '泰山区', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370911', '370911', '岱岳区', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370921', '370921', '宁阳县', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370923', '370923', '东平县', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370982', '370982', '新泰市', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('370983', '370983', '肥城市', '3709', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3710', '3710', '威海市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371002', '371002', '环翠区', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371003', '371003', '文登区', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371071', '371071', '威海火炬高技术产业开发区', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371072', '371072', '威海经济技术开发区', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371073', '371073', '威海临港经济技术开发区', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371082', '371082', '荣成市', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371083', '371083', '乳山市', '3710', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3711', '3711', '日照市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371102', '371102', '东港区', '3711', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371103', '371103', '岚山区', '3711', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371121', '371121', '五莲县', '3711', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371122', '371122', '莒县', '3711', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371171', '371171', '日照经济技术开发区', '3711', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3713', '3713', '临沂市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371302', '371302', '兰山区', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371311', '371311', '罗庄区', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371312', '371312', '河东区', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371321', '371321', '沂南县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371322', '371322', '郯城县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371323', '371323', '沂水县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371324', '371324', '兰陵县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371325', '371325', '费县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371326', '371326', '平邑县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371327', '371327', '莒南县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371328', '371328', '蒙阴县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371329', '371329', '临沭县', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371371', '371371', '临沂高新技术产业开发区', '3713', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3714', '3714', '德州市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371402', '371402', '德城区', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371403', '371403', '陵城区', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371422', '371422', '宁津县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371423', '371423', '庆云县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371424', '371424', '临邑县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371425', '371425', '齐河县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371426', '371426', '平原县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371427', '371427', '夏津县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371428', '371428', '武城县', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371471', '371471', '德州经济技术开发区', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371472', '371472', '德州运河经济开发区', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371481', '371481', '乐陵市', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371482', '371482', '禹城市', '3714', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3715', '3715', '聊城市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371502', '371502', '东昌府区', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371503', '371503', '茌平区', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371521', '371521', '阳谷县', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371522', '371522', '莘县', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371524', '371524', '东阿县', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371525', '371525', '冠县', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371526', '371526', '高唐县', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371581', '371581', '临清市', '3715', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3716', '3716', '滨州市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371602', '371602', '滨城区', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371603', '371603', '沾化区', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371621', '371621', '惠民县', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371622', '371622', '阳信县', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371623', '371623', '无棣县', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371625', '371625', '博兴县', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371681', '371681', '邹平市', '3716', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('3717', '3717', '菏泽市', '37', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371702', '371702', '牡丹区', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371703', '371703', '定陶区', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371721', '371721', '曹县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371722', '371722', '单县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371723', '371723', '成武县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371724', '371724', '巨野县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371725', '371725', '郓城县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371726', '371726', '鄄城县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371728', '371728', '东明县', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371771', '371771', '菏泽经济技术开发区', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('371772', '371772', '菏泽高新技术开发区', '3717', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('41', '41', '河南省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4101', '4101', '郑州市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410102', '410102', '中原区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410103', '410103', '二七区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410104', '410104', '管城回族区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410105', '410105', '金水区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410106', '410106', '上街区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410108', '410108', '惠济区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410122', '410122', '中牟县', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410171', '410171', '郑州经济技术开发区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410172', '410172', '郑州高新技术产业开发区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410173', '410173', '郑州航空港经济综合实验区', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410181', '410181', '巩义市', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410182', '410182', '荥阳市', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410183', '410183', '新密市', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410184', '410184', '新郑市', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410185', '410185', '登封市', '4101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4102', '4102', '开封市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410202', '410202', '龙亭区', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410203', '410203', '顺河回族区', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410204', '410204', '鼓楼区', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410205', '410205', '禹王台区', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410212', '410212', '祥符区', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410221', '410221', '杞县', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410222', '410222', '通许县', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410223', '410223', '尉氏县', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410225', '410225', '兰考县', '4102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4103', '4103', '洛阳市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410302', '410302', '老城区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410303', '410303', '西工区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410304', '410304', '瀍河回族区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410305', '410305', '涧西区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410306', '410306', '吉利区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410311', '410311', '洛龙区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410322', '410322', '孟津县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410323', '410323', '新安县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410324', '410324', '栾川县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410325', '410325', '嵩县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410326', '410326', '汝阳县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410327', '410327', '宜阳县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410328', '410328', '洛宁县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410329', '410329', '伊川县', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410371', '410371', '洛阳高新技术产业开发区', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410381', '410381', '偃师市', '4103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4104', '4104', '平顶山市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410402', '410402', '新华区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410403', '410403', '卫东区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410404', '410404', '石龙区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410411', '410411', '湛河区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410421', '410421', '宝丰县', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410422', '410422', '叶县', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410423', '410423', '鲁山县', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410425', '410425', '郏县', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410471', '410471', '平顶山高新技术产业开发区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410472', '410472', '平顶山市城乡一体化示范区', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410481', '410481', '舞钢市', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410482', '410482', '汝州市', '4104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4105', '4105', '安阳市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410502', '410502', '文峰区', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410503', '410503', '北关区', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410505', '410505', '殷都区', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410506', '410506', '龙安区', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410522', '410522', '安阳县', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410523', '410523', '汤阴县', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410526', '410526', '滑县', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410527', '410527', '内黄县', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410571', '410571', '安阳高新技术产业开发区', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410581', '410581', '林州市', '4105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4106', '4106', '鹤壁市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410602', '410602', '鹤山区', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410603', '410603', '山城区', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410611', '410611', '淇滨区', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410621', '410621', '浚县', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410622', '410622', '淇县', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410671', '410671', '鹤壁经济技术开发区', '4106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4107', '4107', '新乡市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410702', '410702', '红旗区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410703', '410703', '卫滨区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410704', '410704', '凤泉区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410711', '410711', '牧野区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410721', '410721', '新乡县', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410724', '410724', '获嘉县', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410725', '410725', '原阳县', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410726', '410726', '延津县', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410727', '410727', '封丘县', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410771', '410771', '新乡高新技术产业开发区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410772', '410772', '新乡经济技术开发区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410773', '410773', '新乡市平原城乡一体化示范区', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410781', '410781', '卫辉市', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410782', '410782', '辉县市', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410783', '410783', '长垣市', '4107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4108', '4108', '焦作市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410802', '410802', '解放区', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410803', '410803', '中站区', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410804', '410804', '马村区', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410811', '410811', '山阳区', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410821', '410821', '修武县', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410822', '410822', '博爱县', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410823', '410823', '武陟县', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410825', '410825', '温县', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410871', '410871', '焦作城乡一体化示范区', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410882', '410882', '沁阳市', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410883', '410883', '孟州市', '4108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4109', '4109', '濮阳市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410902', '410902', '华龙区', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410922', '410922', '清丰县', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410923', '410923', '南乐县', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410926', '410926', '范县', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410927', '410927', '台前县', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410928', '410928', '濮阳县', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410971', '410971', '河南濮阳工业园区', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('410972', '410972', '濮阳经济技术开发区', '4109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4110', '4110', '许昌市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411002', '411002', '魏都区', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411003', '411003', '建安区', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411024', '411024', '鄢陵县', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411025', '411025', '襄城县', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411071', '411071', '许昌经济技术开发区', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411081', '411081', '禹州市', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411082', '411082', '长葛市', '4110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4111', '4111', '漯河市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411102', '411102', '源汇区', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411103', '411103', '郾城区', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411104', '411104', '召陵区', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411121', '411121', '舞阳县', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411122', '411122', '临颍县', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411171', '411171', '漯河经济技术开发区', '4111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4112', '4112', '三门峡市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411202', '411202', '湖滨区', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411203', '411203', '陕州区', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411221', '411221', '渑池县', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411224', '411224', '卢氏县', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411271', '411271', '河南三门峡经济开发区', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411281', '411281', '义马市', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411282', '411282', '灵宝市', '4112', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4113', '4113', '南阳市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411302', '411302', '宛城区', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411303', '411303', '卧龙区', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411321', '411321', '南召县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411322', '411322', '方城县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411323', '411323', '西峡县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411324', '411324', '镇平县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411325', '411325', '内乡县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411326', '411326', '淅川县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411327', '411327', '社旗县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411328', '411328', '唐河县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411329', '411329', '新野县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411330', '411330', '桐柏县', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411371', '411371', '南阳高新技术产业开发区', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411372', '411372', '南阳市城乡一体化示范区', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411381', '411381', '邓州市', '4113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4114', '4114', '商丘市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411402', '411402', '梁园区', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411403', '411403', '睢阳区', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411421', '411421', '民权县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411422', '411422', '睢县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411423', '411423', '宁陵县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411424', '411424', '柘城县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411425', '411425', '虞城县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411426', '411426', '夏邑县', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411471', '411471', '豫东综合物流产业聚集区', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411472', '411472', '河南商丘经济开发区', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411481', '411481', '永城市', '4114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4115', '4115', '信阳市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411502', '411502', '浉河区', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411503', '411503', '平桥区', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411521', '411521', '罗山县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411522', '411522', '光山县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411523', '411523', '新县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411524', '411524', '商城县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411525', '411525', '固始县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411526', '411526', '潢川县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411527', '411527', '淮滨县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411528', '411528', '息县', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411571', '411571', '信阳高新技术产业开发区', '4115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4116', '4116', '周口市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411602', '411602', '川汇区', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411603', '411603', '淮阳区', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411621', '411621', '扶沟县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411622', '411622', '西华县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411623', '411623', '商水县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411624', '411624', '沈丘县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411625', '411625', '郸城县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411627', '411627', '太康县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411628', '411628', '鹿邑县', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411671', '411671', '河南周口经济开发区', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411681', '411681', '项城市', '4116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4117', '4117', '驻马店市', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411702', '411702', '驿城区', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411721', '411721', '西平县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411722', '411722', '上蔡县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411723', '411723', '平舆县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411724', '411724', '正阳县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411725', '411725', '确山县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411726', '411726', '泌阳县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411727', '411727', '汝南县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411728', '411728', '遂平县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411729', '411729', '新蔡县', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('411771', '411771', '河南驻马店经济开发区', '4117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4190', '4190', '省直辖县级行政区划', '41', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('419001', '419001', '济源市', '4190', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('42', '42', '湖北省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4201', '4201', '武汉市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420102', '420102', '江岸区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420103', '420103', '江汉区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420104', '420104', '硚口区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420105', '420105', '汉阳区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420106', '420106', '武昌区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420107', '420107', '青山区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420111', '420111', '洪山区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420112', '420112', '东西湖区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420113', '420113', '汉南区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420114', '420114', '蔡甸区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420115', '420115', '江夏区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420116', '420116', '黄陂区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420117', '420117', '新洲区', '4201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4202', '4202', '黄石市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420202', '420202', '黄石港区', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420203', '420203', '西塞山区', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420204', '420204', '下陆区', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420205', '420205', '铁山区', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420222', '420222', '阳新县', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420281', '420281', '大冶市', '4202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4203', '4203', '十堰市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420302', '420302', '茅箭区', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420303', '420303', '张湾区', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420304', '420304', '郧阳区', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420322', '420322', '郧西县', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420323', '420323', '竹山县', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420324', '420324', '竹溪县', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420325', '420325', '房县', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420381', '420381', '丹江口市', '4203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4205', '4205', '宜昌市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420502', '420502', '西陵区', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420503', '420503', '伍家岗区', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420504', '420504', '点军区', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420505', '420505', '猇亭区', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420506', '420506', '夷陵区', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420525', '420525', '远安县', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420526', '420526', '兴山县', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420527', '420527', '秭归县', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420528', '420528', '长阳土家族自治县', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420529', '420529', '五峰土家族自治县', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420581', '420581', '宜都市', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420582', '420582', '当阳市', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420583', '420583', '枝江市', '4205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4206', '4206', '襄阳市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420602', '420602', '襄城区', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420606', '420606', '樊城区', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420607', '420607', '襄州区', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420624', '420624', '南漳县', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420625', '420625', '谷城县', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420626', '420626', '保康县', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420682', '420682', '老河口市', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420683', '420683', '枣阳市', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420684', '420684', '宜城市', '4206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4207', '4207', '鄂州市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420702', '420702', '梁子湖区', '4207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420703', '420703', '华容区', '4207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420704', '420704', '鄂城区', '4207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4208', '4208', '荆门市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420802', '420802', '东宝区', '4208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420804', '420804', '掇刀区', '4208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420822', '420822', '沙洋县', '4208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420881', '420881', '钟祥市', '4208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420882', '420882', '京山市', '4208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4209', '4209', '孝感市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420902', '420902', '孝南区', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420921', '420921', '孝昌县', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420922', '420922', '大悟县', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420923', '420923', '云梦县', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420981', '420981', '应城市', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420982', '420982', '安陆市', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('420984', '420984', '汉川市', '4209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4210', '4210', '荆州市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421002', '421002', '沙市区', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421003', '421003', '荆州区', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421022', '421022', '公安县', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421023', '421023', '监利县', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421024', '421024', '江陵县', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421071', '421071', '荆州经济技术开发区', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421081', '421081', '石首市', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421083', '421083', '洪湖市', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421087', '421087', '松滋市', '4210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4211', '4211', '黄冈市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421102', '421102', '黄州区', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421121', '421121', '团风县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421122', '421122', '红安县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421123', '421123', '罗田县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421124', '421124', '英山县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421125', '421125', '浠水县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421126', '421126', '蕲春县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421127', '421127', '黄梅县', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421171', '421171', '龙感湖管理区', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421181', '421181', '麻城市', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421182', '421182', '武穴市', '4211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4212', '4212', '咸宁市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421202', '421202', '咸安区', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421221', '421221', '嘉鱼县', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421222', '421222', '通城县', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421223', '421223', '崇阳县', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421224', '421224', '通山县', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421281', '421281', '赤壁市', '4212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4213', '4213', '随州市', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421303', '421303', '曾都区', '4213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421321', '421321', '随县', '4213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('421381', '421381', '广水市', '4213', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4228', '4228', '恩施土家族苗族自治州', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422801', '422801', '恩施市', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422802', '422802', '利川市', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422822', '422822', '建始县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422823', '422823', '巴东县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422825', '422825', '宣恩县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422826', '422826', '咸丰县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422827', '422827', '来凤县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('422828', '422828', '鹤峰县', '4228', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4290', '4290', '省直辖县级行政区划', '42', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('429004', '429004', '仙桃市', '4290', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('429005', '429005', '潜江市', '4290', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('429006', '429006', '天门市', '4290', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('429021', '429021', '神农架林区', '4290', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('43', '43', '湖南省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4301', '4301', '长沙市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430102', '430102', '芙蓉区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430103', '430103', '天心区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430104', '430104', '岳麓区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430105', '430105', '开福区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430111', '430111', '雨花区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430112', '430112', '望城区', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430121', '430121', '长沙县', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430181', '430181', '浏阳市', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430182', '430182', '宁乡市', '4301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4302', '4302', '株洲市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430202', '430202', '荷塘区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430203', '430203', '芦淞区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430204', '430204', '石峰区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430211', '430211', '天元区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430212', '430212', '渌口区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430223', '430223', '攸县', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430224', '430224', '茶陵县', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430225', '430225', '炎陵县', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430271', '430271', '云龙示范区', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430281', '430281', '醴陵市', '4302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4303', '4303', '湘潭市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430302', '430302', '雨湖区', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430304', '430304', '岳塘区', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430321', '430321', '湘潭县', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430371', '430371', '湖南湘潭高新技术产业园区', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430372', '430372', '湘潭昭山示范区', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430373', '430373', '湘潭九华示范区', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430381', '430381', '湘乡市', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430382', '430382', '韶山市', '4303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4304', '4304', '衡阳市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430405', '430405', '珠晖区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430406', '430406', '雁峰区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430407', '430407', '石鼓区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430408', '430408', '蒸湘区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430412', '430412', '南岳区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430421', '430421', '衡阳县', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430422', '430422', '衡南县', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430423', '430423', '衡山县', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430424', '430424', '衡东县', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430426', '430426', '祁东县', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430471', '430471', '衡阳综合保税区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430472', '430472', '湖南衡阳高新技术产业园区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430473', '430473', '湖南衡阳松木经济开发区', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430481', '430481', '耒阳市', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430482', '430482', '常宁市', '4304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4305', '4305', '邵阳市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430502', '430502', '双清区', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430503', '430503', '大祥区', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430511', '430511', '北塔区', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430522', '430522', '新邵县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430523', '430523', '邵阳县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430524', '430524', '隆回县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430525', '430525', '洞口县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430527', '430527', '绥宁县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430528', '430528', '新宁县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430529', '430529', '城步苗族自治县', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430581', '430581', '武冈市', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430582', '430582', '邵东市', '4305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4306', '4306', '岳阳市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430602', '430602', '岳阳楼区', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430603', '430603', '云溪区', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430611', '430611', '君山区', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430621', '430621', '岳阳县', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430623', '430623', '华容县', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430624', '430624', '湘阴县', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430626', '430626', '平江县', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430671', '430671', '岳阳市屈原管理区', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430681', '430681', '汨罗市', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430682', '430682', '临湘市', '4306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4307', '4307', '常德市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430702', '430702', '武陵区', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430703', '430703', '鼎城区', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430721', '430721', '安乡县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430722', '430722', '汉寿县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430723', '430723', '澧县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430724', '430724', '临澧县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430725', '430725', '桃源县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430726', '430726', '石门县', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430771', '430771', '常德市西洞庭管理区', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430781', '430781', '津市市', '4307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4308', '4308', '张家界市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430802', '430802', '永定区', '4308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430811', '430811', '武陵源区', '4308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430821', '430821', '慈利县', '4308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430822', '430822', '桑植县', '4308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4309', '4309', '益阳市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430902', '430902', '资阳区', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430903', '430903', '赫山区', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430921', '430921', '南县', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430922', '430922', '桃江县', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430923', '430923', '安化县', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430971', '430971', '益阳市大通湖管理区', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430972', '430972', '湖南益阳高新技术产业园区', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('430981', '430981', '沅江市', '4309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4310', '4310', '郴州市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431002', '431002', '北湖区', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431003', '431003', '苏仙区', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431021', '431021', '桂阳县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431022', '431022', '宜章县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431023', '431023', '永兴县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431024', '431024', '嘉禾县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431025', '431025', '临武县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431026', '431026', '汝城县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431027', '431027', '桂东县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431028', '431028', '安仁县', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431081', '431081', '资兴市', '4310', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4311', '4311', '永州市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431102', '431102', '零陵区', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431103', '431103', '冷水滩区', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431121', '431121', '祁阳县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431122', '431122', '东安县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431123', '431123', '双牌县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431124', '431124', '道县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431125', '431125', '江永县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431126', '431126', '宁远县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431127', '431127', '蓝山县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431128', '431128', '新田县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431129', '431129', '江华瑶族自治县', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431171', '431171', '永州经济技术开发区', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431172', '431172', '永州市金洞管理区', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431173', '431173', '永州市回龙圩管理区', '4311', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4312', '4312', '怀化市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431202', '431202', '鹤城区', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431221', '431221', '中方县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431222', '431222', '沅陵县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431223', '431223', '辰溪县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431224', '431224', '溆浦县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431225', '431225', '会同县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431226', '431226', '麻阳苗族自治县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431227', '431227', '新晃侗族自治县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431228', '431228', '芷江侗族自治县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431229', '431229', '靖州苗族侗族自治县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431230', '431230', '通道侗族自治县', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431271', '431271', '怀化市洪江管理区', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431281', '431281', '洪江市', '4312', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4313', '4313', '娄底市', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431302', '431302', '娄星区', '4313', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431321', '431321', '双峰县', '4313', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431322', '431322', '新化县', '4313', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431381', '431381', '冷水江市', '4313', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('431382', '431382', '涟源市', '4313', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4331', '4331', '湘西土家族苗族自治州', '43', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433101', '433101', '吉首市', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433122', '433122', '泸溪县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433123', '433123', '凤凰县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433124', '433124', '花垣县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433125', '433125', '保靖县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433126', '433126', '古丈县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433127', '433127', '永顺县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('433130', '433130', '龙山县', '4331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('44', '44', '广东省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4401', '4401', '广州市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440103', '440103', '荔湾区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440104', '440104', '越秀区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440105', '440105', '海珠区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440106', '440106', '天河区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440111', '440111', '白云区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440112', '440112', '黄埔区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440113', '440113', '番禺区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440114', '440114', '花都区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440115', '440115', '南沙区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440117', '440117', '从化区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440118', '440118', '增城区', '4401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4402', '4402', '韶关市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440203', '440203', '武江区', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440204', '440204', '浈江区', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440205', '440205', '曲江区', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440222', '440222', '始兴县', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440224', '440224', '仁化县', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440229', '440229', '翁源县', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440232', '440232', '乳源瑶族自治县', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440233', '440233', '新丰县', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440281', '440281', '乐昌市', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440282', '440282', '南雄市', '4402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4403', '4403', '深圳市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440303', '440303', '罗湖区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440304', '440304', '福田区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440305', '440305', '南山区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440306', '440306', '宝安区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440307', '440307', '龙岗区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440308', '440308', '盐田区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440309', '440309', '龙华区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440310', '440310', '坪山区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440311', '440311', '光明区', '4403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4404', '4404', '珠海市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440402', '440402', '香洲区', '4404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440403', '440403', '斗门区', '4404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440404', '440404', '金湾区', '4404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4405', '4405', '汕头市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440507', '440507', '龙湖区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440511', '440511', '金平区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440512', '440512', '濠江区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440513', '440513', '潮阳区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440514', '440514', '潮南区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440515', '440515', '澄海区', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440523', '440523', '南澳县', '4405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4406', '4406', '佛山市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440604', '440604', '禅城区', '4406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440605', '440605', '南海区', '4406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440606', '440606', '顺德区', '4406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440607', '440607', '三水区', '4406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440608', '440608', '高明区', '4406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4407', '4407', '江门市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440703', '440703', '蓬江区', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440704', '440704', '江海区', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440705', '440705', '新会区', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440781', '440781', '台山市', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440783', '440783', '开平市', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440784', '440784', '鹤山市', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440785', '440785', '恩平市', '4407', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4408', '4408', '湛江市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440802', '440802', '赤坎区', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440803', '440803', '霞山区', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440804', '440804', '坡头区', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440811', '440811', '麻章区', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440823', '440823', '遂溪县', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440825', '440825', '徐闻县', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440881', '440881', '廉江市', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440882', '440882', '雷州市', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440883', '440883', '吴川市', '4408', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4409', '4409', '茂名市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440902', '440902', '茂南区', '4409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440904', '440904', '电白区', '4409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440981', '440981', '高州市', '4409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440982', '440982', '化州市', '4409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('440983', '440983', '信宜市', '4409', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4412', '4412', '肇庆市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441202', '441202', '端州区', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441203', '441203', '鼎湖区', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441204', '441204', '高要区', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441223', '441223', '广宁县', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441224', '441224', '怀集县', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441225', '441225', '封开县', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441226', '441226', '德庆县', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441284', '441284', '四会市', '4412', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4413', '4413', '惠州市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441302', '441302', '惠城区', '4413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441303', '441303', '惠阳区', '4413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441322', '441322', '博罗县', '4413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441323', '441323', '惠东县', '4413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441324', '441324', '龙门县', '4413', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4414', '4414', '梅州市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441402', '441402', '梅江区', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441403', '441403', '梅县区', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441422', '441422', '大埔县', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441423', '441423', '丰顺县', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441424', '441424', '五华县', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441426', '441426', '平远县', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441427', '441427', '蕉岭县', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441481', '441481', '兴宁市', '4414', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4415', '4415', '汕尾市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441502', '441502', '城区', '4415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441521', '441521', '海丰县', '4415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441523', '441523', '陆河县', '4415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441581', '441581', '陆丰市', '4415', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4416', '4416', '河源市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441602', '441602', '源城区', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441621', '441621', '紫金县', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441622', '441622', '龙川县', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441623', '441623', '连平县', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441624', '441624', '和平县', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441625', '441625', '东源县', '4416', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4417', '4417', '阳江市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441702', '441702', '江城区', '4417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441704', '441704', '阳东区', '4417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441721', '441721', '阳西县', '4417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441781', '441781', '阳春市', '4417', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4418', '4418', '清远市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441802', '441802', '清城区', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441803', '441803', '清新区', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441821', '441821', '佛冈县', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441823', '441823', '阳山县', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441825', '441825', '连山壮族瑶族自治县', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441826', '441826', '连南瑶族自治县', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441881', '441881', '英德市', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441882', '441882', '连州市', '4418', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4419', '4419', '东莞市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900003', '441900003', '东城街道', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900004', '441900004', '南城街道', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900005', '441900005', '万江街道', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900006', '441900006', '莞城街道', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900101', '441900101', '石碣镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900102', '441900102', '石龙镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900103', '441900103', '茶山镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900104', '441900104', '石排镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900105', '441900105', '企石镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900106', '441900106', '横沥镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900107', '441900107', '桥头镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900108', '441900108', '谢岗镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900109', '441900109', '东坑镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900110', '441900110', '常平镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900111', '441900111', '寮步镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900112', '441900112', '樟木头镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900113', '441900113', '大朗镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900114', '441900114', '黄江镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900115', '441900115', '清溪镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900116', '441900116', '塘厦镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900117', '441900117', '凤岗镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900118', '441900118', '大岭山镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900119', '441900119', '长安镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900121', '441900121', '虎门镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900122', '441900122', '厚街镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900123', '441900123', '沙田镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900124', '441900124', '道滘镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900125', '441900125', '洪梅镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900126', '441900126', '麻涌镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900127', '441900127', '望牛墩镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900128', '441900128', '中堂镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900129', '441900129', '高埗镇', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900401', '441900401', '松山湖', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900402', '441900402', '东莞港', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('441900403', '441900403', '东莞生态园', '4419', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4420', '4420', '中山市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000001', '442000001', '石岐街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000002', '442000002', '东区街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000003', '442000003', '中山港街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000004', '442000004', '西区街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000005', '442000005', '南区街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000006', '442000006', '五桂山街道', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000100', '442000100', '小榄镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000101', '442000101', '黄圃镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000102', '442000102', '民众镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000103', '442000103', '东凤镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000104', '442000104', '东升镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000105', '442000105', '古镇镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000106', '442000106', '沙溪镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000107', '442000107', '坦洲镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000108', '442000108', '港口镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000109', '442000109', '三角镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000110', '442000110', '横栏镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000111', '442000111', '南头镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000112', '442000112', '阜沙镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000113', '442000113', '南朗镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000114', '442000114', '三乡镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000115', '442000115', '板芙镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000116', '442000116', '大涌镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('442000117', '442000117', '神湾镇', '4420', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4451', '4451', '潮州市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445102', '445102', '湘桥区', '4451', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445103', '445103', '潮安区', '4451', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445122', '445122', '饶平县', '4451', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4452', '4452', '揭阳市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445202', '445202', '榕城区', '4452', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445203', '445203', '揭东区', '4452', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445222', '445222', '揭西县', '4452', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445224', '445224', '惠来县', '4452', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445281', '445281', '普宁市', '4452', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4453', '4453', '云浮市', '44', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445302', '445302', '云城区', '4453', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445303', '445303', '云安区', '4453', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445321', '445321', '新兴县', '4453', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445322', '445322', '郁南县', '4453', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('445381', '445381', '罗定市', '4453', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('45', '45', '广西壮族自治区', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4501', '4501', '南宁市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450102', '450102', '兴宁区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450103', '450103', '青秀区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450105', '450105', '江南区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450107', '450107', '西乡塘区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450108', '450108', '良庆区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450109', '450109', '邕宁区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450110', '450110', '武鸣区', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450123', '450123', '隆安县', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450124', '450124', '马山县', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450125', '450125', '上林县', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450126', '450126', '宾阳县', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450127', '450127', '横县', '4501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4502', '4502', '柳州市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450202', '450202', '城中区', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450203', '450203', '鱼峰区', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450204', '450204', '柳南区', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450205', '450205', '柳北区', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450206', '450206', '柳江区', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450222', '450222', '柳城县', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450223', '450223', '鹿寨县', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450224', '450224', '融安县', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450225', '450225', '融水苗族自治县', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450226', '450226', '三江侗族自治县', '4502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4503', '4503', '桂林市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450302', '450302', '秀峰区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450303', '450303', '叠彩区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450304', '450304', '象山区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450305', '450305', '七星区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450311', '450311', '雁山区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450312', '450312', '临桂区', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450321', '450321', '阳朔县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450323', '450323', '灵川县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450324', '450324', '全州县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450325', '450325', '兴安县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450326', '450326', '永福县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450327', '450327', '灌阳县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450328', '450328', '龙胜各族自治县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450329', '450329', '资源县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450330', '450330', '平乐县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450332', '450332', '恭城瑶族自治县', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450381', '450381', '荔浦市', '4503', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4504', '4504', '梧州市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450403', '450403', '万秀区', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450405', '450405', '长洲区', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450406', '450406', '龙圩区', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450421', '450421', '苍梧县', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450422', '450422', '藤县', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450423', '450423', '蒙山县', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450481', '450481', '岑溪市', '4504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4505', '4505', '北海市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450502', '450502', '海城区', '4505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450503', '450503', '银海区', '4505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450512', '450512', '铁山港区', '4505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450521', '450521', '合浦县', '4505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4506', '4506', '防城港市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450602', '450602', '港口区', '4506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450603', '450603', '防城区', '4506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450621', '450621', '上思县', '4506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450681', '450681', '东兴市', '4506', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4507', '4507', '钦州市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450702', '450702', '钦南区', '4507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450703', '450703', '钦北区', '4507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450721', '450721', '灵山县', '4507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450722', '450722', '浦北县', '4507', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4508', '4508', '贵港市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450802', '450802', '港北区', '4508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450803', '450803', '港南区', '4508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450804', '450804', '覃塘区', '4508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450821', '450821', '平南县', '4508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450881', '450881', '桂平市', '4508', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4509', '4509', '玉林市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450902', '450902', '玉州区', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450903', '450903', '福绵区', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450921', '450921', '容县', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450922', '450922', '陆川县', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450923', '450923', '博白县', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450924', '450924', '兴业县', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('450981', '450981', '北流市', '4509', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4510', '4510', '百色市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451002', '451002', '右江区', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451003', '451003', '田阳区', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451022', '451022', '田东县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451024', '451024', '德保县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451026', '451026', '那坡县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451027', '451027', '凌云县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451028', '451028', '乐业县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451029', '451029', '田林县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451030', '451030', '西林县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451031', '451031', '隆林各族自治县', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451081', '451081', '靖西市', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451082', '451082', '平果市', '4510', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4511', '4511', '贺州市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451102', '451102', '八步区', '4511', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451103', '451103', '平桂区', '4511', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451121', '451121', '昭平县', '4511', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451122', '451122', '钟山县', '4511', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451123', '451123', '富川瑶族自治县', '4511', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4512', '4512', '河池市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451202', '451202', '金城江区', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451203', '451203', '宜州区', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451221', '451221', '南丹县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451222', '451222', '天峨县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451223', '451223', '凤山县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451224', '451224', '东兰县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451225', '451225', '罗城仫佬族自治县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451226', '451226', '环江毛南族自治县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451227', '451227', '巴马瑶族自治县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451228', '451228', '都安瑶族自治县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451229', '451229', '大化瑶族自治县', '4512', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4513', '4513', '来宾市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451302', '451302', '兴宾区', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451321', '451321', '忻城县', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451322', '451322', '象州县', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451323', '451323', '武宣县', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451324', '451324', '金秀瑶族自治县', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451381', '451381', '合山市', '4513', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4514', '4514', '崇左市', '45', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451402', '451402', '江州区', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451421', '451421', '扶绥县', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451422', '451422', '宁明县', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451423', '451423', '龙州县', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451424', '451424', '大新县', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451425', '451425', '天等县', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('451481', '451481', '凭祥市', '4514', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('46', '46', '海南省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4601', '4601', '海口市', '46', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460105', '460105', '秀英区', '4601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460106', '460106', '龙华区', '4601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460107', '460107', '琼山区', '4601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460108', '460108', '美兰区', '4601', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4602', '4602', '三亚市', '46', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460202', '460202', '海棠区', '4602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460203', '460203', '吉阳区', '4602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460204', '460204', '天涯区', '4602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460205', '460205', '崖州区', '4602', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4603', '4603', '三沙市', '46', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460321', '460321', '西沙群岛', '4603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460322', '460322', '南沙群岛', '4603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460323', '460323', '中沙群岛的岛礁及其海域', '4603', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4604', '4604', '儋州市', '46', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400100', '460400100', '那大镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400101', '460400101', '和庆镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400102', '460400102', '南丰镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400103', '460400103', '大成镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400104', '460400104', '雅星镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400105', '460400105', '兰洋镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400106', '460400106', '光村镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400107', '460400107', '木棠镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400108', '460400108', '海头镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400109', '460400109', '峨蔓镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400111', '460400111', '王五镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400112', '460400112', '白马井镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400113', '460400113', '中和镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400114', '460400114', '排浦镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400115', '460400115', '东成镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400116', '460400116', '新州镇', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400499', '460400499', '洋浦经济开发区', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('460400500', '460400500', '华南热作学院', '4604', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('4690', '4690', '省直辖县级行政区划', '46', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469001', '469001', '五指山市', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469002', '469002', '琼海市', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469005', '469005', '文昌市', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469006', '469006', '万宁市', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469007', '469007', '东方市', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469021', '469021', '定安县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469022', '469022', '屯昌县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469023', '469023', '澄迈县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469024', '469024', '临高县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469025', '469025', '白沙黎族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469026', '469026', '昌江黎族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469027', '469027', '乐东黎族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469028', '469028', '陵水黎族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469029', '469029', '保亭黎族苗族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('469030', '469030', '琼中黎族苗族自治县', '4690', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('50', '50', '重庆市', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5001', '5001', '市辖区', '50', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500101', '500101', '万州区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500102', '500102', '涪陵区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500103', '500103', '渝中区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500104', '500104', '大渡口区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500105', '500105', '江北区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500106', '500106', '沙坪坝区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500107', '500107', '九龙坡区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500108', '500108', '南岸区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500109', '500109', '北碚区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500110', '500110', '綦江区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500111', '500111', '大足区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500112', '500112', '渝北区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500113', '500113', '巴南区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500114', '500114', '黔江区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500115', '500115', '长寿区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500116', '500116', '江津区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500117', '500117', '合川区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500118', '500118', '永川区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500119', '500119', '南川区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500120', '500120', '璧山区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500151', '500151', '铜梁区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500152', '500152', '潼南区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500153', '500153', '荣昌区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500154', '500154', '开州区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500155', '500155', '梁平区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500156', '500156', '武隆区', '5001', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5002', '5002', '县', '50', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500229', '500229', '城口县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500230', '500230', '丰都县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500231', '500231', '垫江县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500233', '500233', '忠县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500235', '500235', '云阳县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500236', '500236', '奉节县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500237', '500237', '巫山县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500238', '500238', '巫溪县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500240', '500240', '石柱土家族自治县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500241', '500241', '秀山土家族苗族自治县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500242', '500242', '酉阳土家族苗族自治县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('500243', '500243', '彭水苗族土家族自治县', '5002', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('51', '51', '四川省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5101', '5101', '成都市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510104', '510104', '锦江区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510105', '510105', '青羊区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510106', '510106', '金牛区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510107', '510107', '武侯区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510108', '510108', '成华区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510112', '510112', '龙泉驿区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510113', '510113', '青白江区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510114', '510114', '新都区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510115', '510115', '温江区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510116', '510116', '双流区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510117', '510117', '郫都区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510118', '510118', '新津区', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510121', '510121', '金堂县', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510129', '510129', '大邑县', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510131', '510131', '蒲江县', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510181', '510181', '都江堰市', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510182', '510182', '彭州市', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510183', '510183', '邛崃市', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510184', '510184', '崇州市', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510185', '510185', '简阳市', '5101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5103', '5103', '自贡市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510302', '510302', '自流井区', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510303', '510303', '贡井区', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510304', '510304', '大安区', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510311', '510311', '沿滩区', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510321', '510321', '荣县', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510322', '510322', '富顺县', '5103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5104', '5104', '攀枝花市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510402', '510402', '东区', '5104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510403', '510403', '西区', '5104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510411', '510411', '仁和区', '5104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510421', '510421', '米易县', '5104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510422', '510422', '盐边县', '5104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5105', '5105', '泸州市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510502', '510502', '江阳区', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510503', '510503', '纳溪区', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510504', '510504', '龙马潭区', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510521', '510521', '泸县', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510522', '510522', '合江县', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510524', '510524', '叙永县', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510525', '510525', '古蔺县', '5105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5106', '5106', '德阳市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510603', '510603', '旌阳区', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510604', '510604', '罗江区', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510623', '510623', '中江县', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510681', '510681', '广汉市', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510682', '510682', '什邡市', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510683', '510683', '绵竹市', '5106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5107', '5107', '绵阳市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510703', '510703', '涪城区', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510704', '510704', '游仙区', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510705', '510705', '安州区', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510722', '510722', '三台县', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510723', '510723', '盐亭县', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510725', '510725', '梓潼县', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510726', '510726', '北川羌族自治县', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510727', '510727', '平武县', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510781', '510781', '江油市', '5107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5108', '5108', '广元市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510802', '510802', '利州区', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510811', '510811', '昭化区', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510812', '510812', '朝天区', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510821', '510821', '旺苍县', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510822', '510822', '青川县', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510823', '510823', '剑阁县', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510824', '510824', '苍溪县', '5108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5109', '5109', '遂宁市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510903', '510903', '船山区', '5109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510904', '510904', '安居区', '5109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510921', '510921', '蓬溪县', '5109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510923', '510923', '大英县', '5109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('510981', '510981', '射洪市', '5109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5110', '5110', '内江市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511002', '511002', '市中区', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511011', '511011', '东兴区', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511024', '511024', '威远县', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511025', '511025', '资中县', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511071', '511071', '内江经济开发区', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511083', '511083', '隆昌市', '5110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5111', '5111', '乐山市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511102', '511102', '市中区', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511111', '511111', '沙湾区', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511112', '511112', '五通桥区', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511113', '511113', '金口河区', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511123', '511123', '犍为县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511124', '511124', '井研县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511126', '511126', '夹江县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511129', '511129', '沐川县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511132', '511132', '峨边彝族自治县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511133', '511133', '马边彝族自治县', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511181', '511181', '峨眉山市', '5111', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5113', '5113', '南充市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511302', '511302', '顺庆区', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511303', '511303', '高坪区', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511304', '511304', '嘉陵区', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511321', '511321', '南部县', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511322', '511322', '营山县', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511323', '511323', '蓬安县', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511324', '511324', '仪陇县', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511325', '511325', '西充县', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511381', '511381', '阆中市', '5113', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5114', '5114', '眉山市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511402', '511402', '东坡区', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511403', '511403', '彭山区', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511421', '511421', '仁寿县', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511423', '511423', '洪雅县', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511424', '511424', '丹棱县', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511425', '511425', '青神县', '5114', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5115', '5115', '宜宾市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511502', '511502', '翠屏区', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511503', '511503', '南溪区', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511504', '511504', '叙州区', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511523', '511523', '江安县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511524', '511524', '长宁县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511525', '511525', '高县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511526', '511526', '珙县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511527', '511527', '筠连县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511528', '511528', '兴文县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511529', '511529', '屏山县', '5115', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5116', '5116', '广安市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511602', '511602', '广安区', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511603', '511603', '前锋区', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511621', '511621', '岳池县', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511622', '511622', '武胜县', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511623', '511623', '邻水县', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511681', '511681', '华蓥市', '5116', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5117', '5117', '达州市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511702', '511702', '通川区', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511703', '511703', '达川区', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511722', '511722', '宣汉县', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511723', '511723', '开江县', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511724', '511724', '大竹县', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511725', '511725', '渠县', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511771', '511771', '达州经济开发区', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511781', '511781', '万源市', '5117', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5118', '5118', '雅安市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511802', '511802', '雨城区', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511803', '511803', '名山区', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511822', '511822', '荥经县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511823', '511823', '汉源县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511824', '511824', '石棉县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511825', '511825', '天全县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511826', '511826', '芦山县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511827', '511827', '宝兴县', '5118', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5119', '5119', '巴中市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511902', '511902', '巴州区', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511903', '511903', '恩阳区', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511921', '511921', '通江县', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511922', '511922', '南江县', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511923', '511923', '平昌县', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('511971', '511971', '巴中经济开发区', '5119', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5120', '5120', '资阳市', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('512002', '512002', '雁江区', '5120', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('512021', '512021', '安岳县', '5120', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('512022', '512022', '乐至县', '5120', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5132', '5132', '阿坝藏族羌族自治州', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513201', '513201', '马尔康市', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513221', '513221', '汶川县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513222', '513222', '理县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513223', '513223', '茂县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513224', '513224', '松潘县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513225', '513225', '九寨沟县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513226', '513226', '金川县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513227', '513227', '小金县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513228', '513228', '黑水县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513230', '513230', '壤塘县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513231', '513231', '阿坝县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513232', '513232', '若尔盖县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513233', '513233', '红原县', '5132', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5133', '5133', '甘孜藏族自治州', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513301', '513301', '康定市', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513322', '513322', '泸定县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513323', '513323', '丹巴县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513324', '513324', '九龙县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513325', '513325', '雅江县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513326', '513326', '道孚县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513327', '513327', '炉霍县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513328', '513328', '甘孜县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513329', '513329', '新龙县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513330', '513330', '德格县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513331', '513331', '白玉县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513332', '513332', '石渠县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513333', '513333', '色达县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513334', '513334', '理塘县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513335', '513335', '巴塘县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513336', '513336', '乡城县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513337', '513337', '稻城县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513338', '513338', '得荣县', '5133', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5134', '5134', '凉山彝族自治州', '51', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513401', '513401', '西昌市', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513422', '513422', '木里藏族自治县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513423', '513423', '盐源县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513424', '513424', '德昌县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513425', '513425', '会理县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513426', '513426', '会东县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513427', '513427', '宁南县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513428', '513428', '普格县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513429', '513429', '布拖县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513430', '513430', '金阳县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513431', '513431', '昭觉县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513432', '513432', '喜德县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513433', '513433', '冕宁县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513434', '513434', '越西县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513435', '513435', '甘洛县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513436', '513436', '美姑县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('513437', '513437', '雷波县', '5134', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('52', '52', '贵州省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5201', '5201', '贵阳市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520102', '520102', '南明区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520103', '520103', '云岩区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520111', '520111', '花溪区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520112', '520112', '乌当区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520113', '520113', '白云区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520115', '520115', '观山湖区', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520121', '520121', '开阳县', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520122', '520122', '息烽县', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520123', '520123', '修文县', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520181', '520181', '清镇市', '5201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5202', '5202', '六盘水市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520201', '520201', '钟山区', '5202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520203', '520203', '六枝特区', '5202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520221', '520221', '水城县', '5202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520281', '520281', '盘州市', '5202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5203', '5203', '遵义市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520302', '520302', '红花岗区', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520303', '520303', '汇川区', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520304', '520304', '播州区', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520322', '520322', '桐梓县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520323', '520323', '绥阳县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520324', '520324', '正安县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520325', '520325', '道真仡佬族苗族自治县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520326', '520326', '务川仡佬族苗族自治县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520327', '520327', '凤冈县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520328', '520328', '湄潭县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520329', '520329', '余庆县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520330', '520330', '习水县', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520381', '520381', '赤水市', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520382', '520382', '仁怀市', '5203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5204', '5204', '安顺市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520402', '520402', '西秀区', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520403', '520403', '平坝区', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520422', '520422', '普定县', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520423', '520423', '镇宁布依族苗族自治县', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520424', '520424', '关岭布依族苗族自治县', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520425', '520425', '紫云苗族布依族自治县', '5204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5205', '5205', '毕节市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520502', '520502', '七星关区', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520521', '520521', '大方县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520522', '520522', '黔西县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520523', '520523', '金沙县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520524', '520524', '织金县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520525', '520525', '纳雍县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520526', '520526', '威宁彝族回族苗族自治县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520527', '520527', '赫章县', '5205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5206', '5206', '铜仁市', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520602', '520602', '碧江区', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520603', '520603', '万山区', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520621', '520621', '江口县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520622', '520622', '玉屏侗族自治县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520623', '520623', '石阡县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520624', '520624', '思南县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520625', '520625', '印江土家族苗族自治县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520626', '520626', '德江县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520627', '520627', '沿河土家族自治县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('520628', '520628', '松桃苗族自治县', '5206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5223', '5223', '黔西南布依族苗族自治州', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522301', '522301', '兴义市', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522302', '522302', '兴仁市', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522323', '522323', '普安县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522324', '522324', '晴隆县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522325', '522325', '贞丰县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522326', '522326', '望谟县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522327', '522327', '册亨县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522328', '522328', '安龙县', '5223', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5226', '5226', '黔东南苗族侗族自治州', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522601', '522601', '凯里市', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522622', '522622', '黄平县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522623', '522623', '施秉县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522624', '522624', '三穗县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522625', '522625', '镇远县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522626', '522626', '岑巩县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522627', '522627', '天柱县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522628', '522628', '锦屏县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522629', '522629', '剑河县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522630', '522630', '台江县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522631', '522631', '黎平县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522632', '522632', '榕江县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522633', '522633', '从江县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522634', '522634', '雷山县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522635', '522635', '麻江县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522636', '522636', '丹寨县', '5226', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5227', '5227', '黔南布依族苗族自治州', '52', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522701', '522701', '都匀市', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522702', '522702', '福泉市', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522722', '522722', '荔波县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522723', '522723', '贵定县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522725', '522725', '瓮安县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522726', '522726', '独山县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522727', '522727', '平塘县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522728', '522728', '罗甸县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522729', '522729', '长顺县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522730', '522730', '龙里县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522731', '522731', '惠水县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('522732', '522732', '三都水族自治县', '5227', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('53', '53', '云南省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5301', '5301', '昆明市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530102', '530102', '五华区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530103', '530103', '盘龙区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530111', '530111', '官渡区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530112', '530112', '西山区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530113', '530113', '东川区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530114', '530114', '呈贡区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530115', '530115', '晋宁区', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530124', '530124', '富民县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530125', '530125', '宜良县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530126', '530126', '石林彝族自治县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530127', '530127', '嵩明县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530128', '530128', '禄劝彝族苗族自治县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530129', '530129', '寻甸回族彝族自治县', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530181', '530181', '安宁市', '5301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5303', '5303', '曲靖市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530302', '530302', '麒麟区', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530303', '530303', '沾益区', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530304', '530304', '马龙区', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530322', '530322', '陆良县', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530323', '530323', '师宗县', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530324', '530324', '罗平县', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530325', '530325', '富源县', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530326', '530326', '会泽县', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530381', '530381', '宣威市', '5303', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5304', '5304', '玉溪市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530402', '530402', '红塔区', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530403', '530403', '江川区', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530423', '530423', '通海县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530424', '530424', '华宁县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530425', '530425', '易门县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530426', '530426', '峨山彝族自治县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530427', '530427', '新平彝族傣族自治县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530428', '530428', '元江哈尼族彝族傣族自治县', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530481', '530481', '澄江市', '5304', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5305', '5305', '保山市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530502', '530502', '隆阳区', '5305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530521', '530521', '施甸县', '5305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530523', '530523', '龙陵县', '5305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530524', '530524', '昌宁县', '5305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530581', '530581', '腾冲市', '5305', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5306', '5306', '昭通市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530602', '530602', '昭阳区', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530621', '530621', '鲁甸县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530622', '530622', '巧家县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530623', '530623', '盐津县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530624', '530624', '大关县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530625', '530625', '永善县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530626', '530626', '绥江县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530627', '530627', '镇雄县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530628', '530628', '彝良县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530629', '530629', '威信县', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530681', '530681', '水富市', '5306', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5307', '5307', '丽江市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530702', '530702', '古城区', '5307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530721', '530721', '玉龙纳西族自治县', '5307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530722', '530722', '永胜县', '5307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530723', '530723', '华坪县', '5307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530724', '530724', '宁蒗彝族自治县', '5307', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5308', '5308', '普洱市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530802', '530802', '思茅区', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530821', '530821', '宁洱哈尼族彝族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530822', '530822', '墨江哈尼族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530823', '530823', '景东彝族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530824', '530824', '景谷傣族彝族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530825', '530825', '镇沅彝族哈尼族拉祜族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530826', '530826', '江城哈尼族彝族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530827', '530827', '孟连傣族拉祜族佤族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530828', '530828', '澜沧拉祜族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530829', '530829', '西盟佤族自治县', '5308', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5309', '5309', '临沧市', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530902', '530902', '临翔区', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530921', '530921', '凤庆县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530922', '530922', '云县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530923', '530923', '永德县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530924', '530924', '镇康县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530925', '530925', '双江拉祜族佤族布朗族傣族自治县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530926', '530926', '耿马傣族佤族自治县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('530927', '530927', '沧源佤族自治县', '5309', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5323', '5323', '楚雄彝族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532301', '532301', '楚雄市', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532322', '532322', '双柏县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532323', '532323', '牟定县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532324', '532324', '南华县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532325', '532325', '姚安县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532326', '532326', '大姚县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532327', '532327', '永仁县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532328', '532328', '元谋县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532329', '532329', '武定县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532331', '532331', '禄丰县', '5323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5325', '5325', '红河哈尼族彝族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532501', '532501', '个旧市', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532502', '532502', '开远市', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532503', '532503', '蒙自市', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532504', '532504', '弥勒市', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532523', '532523', '屏边苗族自治县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532524', '532524', '建水县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532525', '532525', '石屏县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532527', '532527', '泸西县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532528', '532528', '元阳县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532529', '532529', '红河县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532530', '532530', '金平苗族瑶族傣族自治县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532531', '532531', '绿春县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532532', '532532', '河口瑶族自治县', '5325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5326', '5326', '文山壮族苗族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532601', '532601', '文山市', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532622', '532622', '砚山县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532623', '532623', '西畴县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532624', '532624', '麻栗坡县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532625', '532625', '马关县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532626', '532626', '丘北县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532627', '532627', '广南县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532628', '532628', '富宁县', '5326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5328', '5328', '西双版纳傣族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532801', '532801', '景洪市', '5328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532822', '532822', '勐海县', '5328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532823', '532823', '勐腊县', '5328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5329', '5329', '大理白族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532901', '532901', '大理市', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532922', '532922', '漾濞彝族自治县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532923', '532923', '祥云县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532924', '532924', '宾川县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532925', '532925', '弥渡县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532926', '532926', '南涧彝族自治县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532927', '532927', '巍山彝族回族自治县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532928', '532928', '永平县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532929', '532929', '云龙县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532930', '532930', '洱源县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532931', '532931', '剑川县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('532932', '532932', '鹤庆县', '5329', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5331', '5331', '德宏傣族景颇族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533102', '533102', '瑞丽市', '5331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533103', '533103', '芒市', '5331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533122', '533122', '梁河县', '5331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533123', '533123', '盈江县', '5331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533124', '533124', '陇川县', '5331', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5333', '5333', '怒江傈僳族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533301', '533301', '泸水市', '5333', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533323', '533323', '福贡县', '5333', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533324', '533324', '贡山独龙族怒族自治县', '5333', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533325', '533325', '兰坪白族普米族自治县', '5333', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5334', '5334', '迪庆藏族自治州', '53', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533401', '533401', '香格里拉市', '5334', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533422', '533422', '德钦县', '5334', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('533423', '533423', '维西傈僳族自治县', '5334', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('54', '54', '西藏自治区', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5401', '5401', '拉萨市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540102', '540102', '城关区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540103', '540103', '堆龙德庆区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540104', '540104', '达孜区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540121', '540121', '林周县', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540122', '540122', '当雄县', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540123', '540123', '尼木县', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540124', '540124', '曲水县', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540127', '540127', '墨竹工卡县', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540171', '540171', '格尔木藏青工业园区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540172', '540172', '拉萨经济技术开发区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540173', '540173', '西藏文化旅游创意园区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540174', '540174', '达孜工业园区', '5401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5402', '5402', '日喀则市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540202', '540202', '桑珠孜区', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540221', '540221', '南木林县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540222', '540222', '江孜县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540223', '540223', '定日县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540224', '540224', '萨迦县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540225', '540225', '拉孜县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540226', '540226', '昂仁县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540227', '540227', '谢通门县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540228', '540228', '白朗县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540229', '540229', '仁布县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540230', '540230', '康马县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540231', '540231', '定结县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540232', '540232', '仲巴县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540233', '540233', '亚东县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540234', '540234', '吉隆县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540235', '540235', '聂拉木县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540236', '540236', '萨嘎县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540237', '540237', '岗巴县', '5402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5403', '5403', '昌都市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540302', '540302', '卡若区', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540321', '540321', '江达县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540322', '540322', '贡觉县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540323', '540323', '类乌齐县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540324', '540324', '丁青县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540325', '540325', '察雅县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540326', '540326', '八宿县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540327', '540327', '左贡县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540328', '540328', '芒康县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540329', '540329', '洛隆县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540330', '540330', '边坝县', '5403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5404', '5404', '林芝市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540402', '540402', '巴宜区', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540421', '540421', '工布江达县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540422', '540422', '米林县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540423', '540423', '墨脱县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540424', '540424', '波密县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540425', '540425', '察隅县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540426', '540426', '朗县', '5404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5405', '5405', '山南市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540502', '540502', '乃东区', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540521', '540521', '扎囊县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540522', '540522', '贡嘎县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540523', '540523', '桑日县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540524', '540524', '琼结县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540525', '540525', '曲松县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540526', '540526', '措美县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540527', '540527', '洛扎县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540528', '540528', '加查县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540529', '540529', '隆子县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540530', '540530', '错那县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540531', '540531', '浪卡子县', '5405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5406', '5406', '那曲市', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540602', '540602', '色尼区', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540621', '540621', '嘉黎县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540622', '540622', '比如县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540623', '540623', '聂荣县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540624', '540624', '安多县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540625', '540625', '申扎县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540626', '540626', '索县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540627', '540627', '班戈县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540628', '540628', '巴青县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540629', '540629', '尼玛县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('540630', '540630', '双湖县', '5406', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('5425', '5425', '阿里地区', '54', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542521', '542521', '普兰县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542522', '542522', '札达县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542523', '542523', '噶尔县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542524', '542524', '日土县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542525', '542525', '革吉县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542526', '542526', '改则县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('542527', '542527', '措勤县', '5425', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('61', '61', '陕西省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6101', '6101', '西安市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610102', '610102', '新城区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610103', '610103', '碑林区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610104', '610104', '莲湖区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610111', '610111', '灞桥区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610112', '610112', '未央区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610113', '610113', '雁塔区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610114', '610114', '阎良区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610115', '610115', '临潼区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610116', '610116', '长安区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610117', '610117', '高陵区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610118', '610118', '鄠邑区', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610122', '610122', '蓝田县', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610124', '610124', '周至县', '6101', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6102', '6102', '铜川市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610202', '610202', '王益区', '6102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610203', '610203', '印台区', '6102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610204', '610204', '耀州区', '6102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610222', '610222', '宜君县', '6102', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6103', '6103', '宝鸡市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610302', '610302', '渭滨区', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610303', '610303', '金台区', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610304', '610304', '陈仓区', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610322', '610322', '凤翔县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610323', '610323', '岐山县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610324', '610324', '扶风县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610326', '610326', '眉县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610327', '610327', '陇县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610328', '610328', '千阳县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610329', '610329', '麟游县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610330', '610330', '凤县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610331', '610331', '太白县', '6103', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6104', '6104', '咸阳市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610402', '610402', '秦都区', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610403', '610403', '杨陵区', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610404', '610404', '渭城区', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610422', '610422', '三原县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610423', '610423', '泾阳县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610424', '610424', '乾县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610425', '610425', '礼泉县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610426', '610426', '永寿县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610428', '610428', '长武县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610429', '610429', '旬邑县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610430', '610430', '淳化县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610431', '610431', '武功县', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610481', '610481', '兴平市', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610482', '610482', '彬州市', '6104', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6105', '6105', '渭南市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610502', '610502', '临渭区', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610503', '610503', '华州区', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610522', '610522', '潼关县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610523', '610523', '大荔县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610524', '610524', '合阳县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610525', '610525', '澄城县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610526', '610526', '蒲城县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610527', '610527', '白水县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610528', '610528', '富平县', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610581', '610581', '韩城市', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610582', '610582', '华阴市', '6105', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6106', '6106', '延安市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610602', '610602', '宝塔区', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610603', '610603', '安塞区', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610621', '610621', '延长县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610622', '610622', '延川县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610625', '610625', '志丹县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610626', '610626', '吴起县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610627', '610627', '甘泉县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610628', '610628', '富县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610629', '610629', '洛川县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610630', '610630', '宜川县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610631', '610631', '黄龙县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610632', '610632', '黄陵县', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610681', '610681', '子长市', '6106', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6107', '6107', '汉中市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610702', '610702', '汉台区', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610703', '610703', '南郑区', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610722', '610722', '城固县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610723', '610723', '洋县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610724', '610724', '西乡县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610725', '610725', '勉县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610726', '610726', '宁强县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610727', '610727', '略阳县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610728', '610728', '镇巴县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610729', '610729', '留坝县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610730', '610730', '佛坪县', '6107', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6108', '6108', '榆林市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610802', '610802', '榆阳区', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610803', '610803', '横山区', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610822', '610822', '府谷县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610824', '610824', '靖边县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610825', '610825', '定边县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610826', '610826', '绥德县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610827', '610827', '米脂县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610828', '610828', '佳县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610829', '610829', '吴堡县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610830', '610830', '清涧县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610831', '610831', '子洲县', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610881', '610881', '神木市', '6108', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6109', '6109', '安康市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610902', '610902', '汉滨区', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610921', '610921', '汉阴县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610922', '610922', '石泉县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610923', '610923', '宁陕县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610924', '610924', '紫阳县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610925', '610925', '岚皋县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610926', '610926', '平利县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610927', '610927', '镇坪县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610928', '610928', '旬阳县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('610929', '610929', '白河县', '6109', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6110', '6110', '商洛市', '61', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611002', '611002', '商州区', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611021', '611021', '洛南县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611022', '611022', '丹凤县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611023', '611023', '商南县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611024', '611024', '山阳县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611025', '611025', '镇安县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('611026', '611026', '柞水县', '6110', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('62', '62', '甘肃省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6201', '6201', '兰州市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620102', '620102', '城关区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620103', '620103', '七里河区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620104', '620104', '西固区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620105', '620105', '安宁区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620111', '620111', '红古区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620121', '620121', '永登县', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620122', '620122', '皋兰县', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620123', '620123', '榆中县', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620171', '620171', '兰州新区', '6201', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6202', '6202', '嘉峪关市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620201001', '620201001', '雄关街道', '6202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620201002', '620201002', '钢城街道', '6202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620201100', '620201100', '新城镇', '6202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620201101', '620201101', '峪泉镇', '6202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620201102', '620201102', '文殊镇', '6202', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6203', '6203', '金昌市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620302', '620302', '金川区', '6203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620321', '620321', '永昌县', '6203', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6204', '6204', '白银市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620402', '620402', '白银区', '6204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620403', '620403', '平川区', '6204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620421', '620421', '靖远县', '6204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620422', '620422', '会宁县', '6204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620423', '620423', '景泰县', '6204', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6205', '6205', '天水市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620502', '620502', '秦州区', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620503', '620503', '麦积区', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620521', '620521', '清水县', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620522', '620522', '秦安县', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620523', '620523', '甘谷县', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620524', '620524', '武山县', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620525', '620525', '张家川回族自治县', '6205', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6206', '6206', '武威市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620602', '620602', '凉州区', '6206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620621', '620621', '民勤县', '6206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620622', '620622', '古浪县', '6206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620623', '620623', '天祝藏族自治县', '6206', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6207', '6207', '张掖市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620702', '620702', '甘州区', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620721', '620721', '肃南裕固族自治县', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620722', '620722', '民乐县', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620723', '620723', '临泽县', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620724', '620724', '高台县', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620725', '620725', '山丹县', '6207', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6208', '6208', '平凉市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620802', '620802', '崆峒区', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620821', '620821', '泾川县', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620822', '620822', '灵台县', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620823', '620823', '崇信县', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620825', '620825', '庄浪县', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620826', '620826', '静宁县', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620881', '620881', '华亭市', '6208', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6209', '6209', '酒泉市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620902', '620902', '肃州区', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620921', '620921', '金塔县', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620922', '620922', '瓜州县', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620923', '620923', '肃北蒙古族自治县', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620924', '620924', '阿克塞哈萨克族自治县', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620981', '620981', '玉门市', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('620982', '620982', '敦煌市', '6209', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6210', '6210', '庆阳市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621002', '621002', '西峰区', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621021', '621021', '庆城县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621022', '621022', '环县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621023', '621023', '华池县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621024', '621024', '合水县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621025', '621025', '正宁县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621026', '621026', '宁县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621027', '621027', '镇原县', '6210', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6211', '6211', '定西市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621102', '621102', '安定区', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621121', '621121', '通渭县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621122', '621122', '陇西县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621123', '621123', '渭源县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621124', '621124', '临洮县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621125', '621125', '漳县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621126', '621126', '岷县', '6211', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6212', '6212', '陇南市', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621202', '621202', '武都区', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621221', '621221', '成县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621222', '621222', '文县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621223', '621223', '宕昌县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621224', '621224', '康县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621225', '621225', '西和县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621226', '621226', '礼县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621227', '621227', '徽县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('621228', '621228', '两当县', '6212', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6229', '6229', '临夏回族自治州', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622901', '622901', '临夏市', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622921', '622921', '临夏县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622922', '622922', '康乐县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622923', '622923', '永靖县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622924', '622924', '广河县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622925', '622925', '和政县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622926', '622926', '东乡族自治县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('622927', '622927', '积石山保安族东乡族撒拉族自治县', '6229', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6230', '6230', '甘南藏族自治州', '62', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623001', '623001', '合作市', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623021', '623021', '临潭县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623022', '623022', '卓尼县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623023', '623023', '舟曲县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623024', '623024', '迭部县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623025', '623025', '玛曲县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623026', '623026', '碌曲县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('623027', '623027', '夏河县', '6230', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('63', '63', '青海省', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6301', '6301', '西宁市', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630102', '630102', '城东区', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630103', '630103', '城中区', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630104', '630104', '城西区', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630105', '630105', '城北区', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630106', '630106', '湟中区', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630121', '630121', '大通回族土族自治县', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630123', '630123', '湟源县', '6301', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6302', '6302', '海东市', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630202', '630202', '乐都区', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630203', '630203', '平安区', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630222', '630222', '民和回族土族自治县', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630223', '630223', '互助土族自治县', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630224', '630224', '化隆回族自治县', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('630225', '630225', '循化撒拉族自治县', '6302', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6322', '6322', '海北藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632221', '632221', '门源回族自治县', '6322', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632222', '632222', '祁连县', '6322', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632223', '632223', '海晏县', '6322', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632224', '632224', '刚察县', '6322', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6323', '6323', '黄南藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632321', '632321', '同仁县', '6323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632322', '632322', '尖扎县', '6323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632323', '632323', '泽库县', '6323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632324', '632324', '河南蒙古族自治县', '6323', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6325', '6325', '海南藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632521', '632521', '共和县', '6325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632522', '632522', '同德县', '6325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632523', '632523', '贵德县', '6325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632524', '632524', '兴海县', '6325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632525', '632525', '贵南县', '6325', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6326', '6326', '果洛藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632621', '632621', '玛沁县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632622', '632622', '班玛县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632623', '632623', '甘德县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632624', '632624', '达日县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632625', '632625', '久治县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632626', '632626', '玛多县', '6326', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6327', '6327', '玉树藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632701', '632701', '玉树市', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632722', '632722', '杂多县', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632723', '632723', '称多县', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632724', '632724', '治多县', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632725', '632725', '囊谦县', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632726', '632726', '曲麻莱县', '6327', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6328', '6328', '海西蒙古族藏族自治州', '63', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632801', '632801', '格尔木市', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632802', '632802', '德令哈市', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632803', '632803', '茫崖市', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632821', '632821', '乌兰县', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632822', '632822', '都兰县', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632823', '632823', '天峻县', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('632857', '632857', '大柴旦行政委员会', '6328', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('64', '64', '宁夏回族自治区', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6401', '6401', '银川市', '64', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640104', '640104', '兴庆区', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640105', '640105', '西夏区', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640106', '640106', '金凤区', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640121', '640121', '永宁县', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640122', '640122', '贺兰县', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640181', '640181', '灵武市', '6401', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6402', '6402', '石嘴山市', '64', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640202', '640202', '大武口区', '6402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640205', '640205', '惠农区', '6402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640221', '640221', '平罗县', '6402', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6403', '6403', '吴忠市', '64', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640302', '640302', '利通区', '6403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640303', '640303', '红寺堡区', '6403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640323', '640323', '盐池县', '6403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640324', '640324', '同心县', '6403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640381', '640381', '青铜峡市', '6403', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6404', '6404', '固原市', '64', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640402', '640402', '原州区', '6404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640422', '640422', '西吉县', '6404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640423', '640423', '隆德县', '6404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640424', '640424', '泾源县', '6404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640425', '640425', '彭阳县', '6404', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6405', '6405', '中卫市', '64', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640502', '640502', '沙坡头区', '6405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640521', '640521', '中宁县', '6405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('640522', '640522', '海原县', '6405', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('65', '65', '新疆维吾尔自治区', NULL, 1); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6501', '6501', '乌鲁木齐市', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650102', '650102', '天山区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650103', '650103', '沙依巴克区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650104', '650104', '新市区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650105', '650105', '水磨沟区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650106', '650106', '头屯河区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650107', '650107', '达坂城区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650109', '650109', '米东区', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650121', '650121', '乌鲁木齐县', '6501', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6502', '6502', '克拉玛依市', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650202', '650202', '独山子区', '6502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650203', '650203', '克拉玛依区', '6502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650204', '650204', '白碱滩区', '6502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650205', '650205', '乌尔禾区', '6502', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6504', '6504', '吐鲁番市', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650402', '650402', '高昌区', '6504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650421', '650421', '鄯善县', '6504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650422', '650422', '托克逊县', '6504', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6505', '6505', '哈密市', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650502', '650502', '伊州区', '6505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650521', '650521', '巴里坤哈萨克自治县', '6505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('650522', '650522', '伊吾县', '6505', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6523', '6523', '昌吉回族自治州', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652301', '652301', '昌吉市', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652302', '652302', '阜康市', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652323', '652323', '呼图壁县', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652324', '652324', '玛纳斯县', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652325', '652325', '奇台县', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652327', '652327', '吉木萨尔县', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652328', '652328', '木垒哈萨克自治县', '6523', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6527', '6527', '博尔塔拉蒙古自治州', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652701', '652701', '博乐市', '6527', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652702', '652702', '阿拉山口市', '6527', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652722', '652722', '精河县', '6527', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652723', '652723', '温泉县', '6527', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6528', '6528', '巴音郭楞蒙古自治州', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652801', '652801', '库尔勒市', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652822', '652822', '轮台县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652823', '652823', '尉犁县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652824', '652824', '若羌县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652825', '652825', '且末县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652826', '652826', '焉耆回族自治县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652827', '652827', '和静县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652828', '652828', '和硕县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652829', '652829', '博湖县', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652871', '652871', '库尔勒经济技术开发区', '6528', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6529', '6529', '阿克苏地区', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652901', '652901', '阿克苏市', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652902', '652902', '库车市', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652922', '652922', '温宿县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652924', '652924', '沙雅县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652925', '652925', '新和县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652926', '652926', '拜城县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652927', '652927', '乌什县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652928', '652928', '阿瓦提县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('652929', '652929', '柯坪县', '6529', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6530', '6530', '克孜勒苏柯尔克孜自治州', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653001', '653001', '阿图什市', '6530', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653022', '653022', '阿克陶县', '6530', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653023', '653023', '阿合奇县', '6530', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653024', '653024', '乌恰县', '6530', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6531', '6531', '喀什地区', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653101', '653101', '喀什市', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653121', '653121', '疏附县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653122', '653122', '疏勒县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653123', '653123', '英吉沙县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653124', '653124', '泽普县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653125', '653125', '莎车县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653126', '653126', '叶城县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653127', '653127', '麦盖提县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653128', '653128', '岳普湖县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653129', '653129', '伽师县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653130', '653130', '巴楚县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653131', '653131', '塔什库尔干塔吉克自治县', '6531', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6532', '6532', '和田地区', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653201', '653201', '和田市', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653221', '653221', '和田县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653222', '653222', '墨玉县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653223', '653223', '皮山县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653224', '653224', '洛浦县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653225', '653225', '策勒县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653226', '653226', '于田县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('653227', '653227', '民丰县', '6532', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6540', '6540', '伊犁哈萨克自治州', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654002', '654002', '伊宁市', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654003', '654003', '奎屯市', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654004', '654004', '霍尔果斯市', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654021', '654021', '伊宁县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654022', '654022', '察布查尔锡伯自治县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654023', '654023', '霍城县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654024', '654024', '巩留县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654025', '654025', '新源县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654026', '654026', '昭苏县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654027', '654027', '特克斯县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654028', '654028', '尼勒克县', '6540', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6542', '6542', '塔城地区', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654201', '654201', '塔城市', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654202', '654202', '乌苏市', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654221', '654221', '额敏县', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654223', '654223', '沙湾县', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654224', '654224', '托里县', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654225', '654225', '裕民县', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654226', '654226', '和布克赛尔蒙古自治县', '6542', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6543', '6543', '阿勒泰地区', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654301', '654301', '阿勒泰市', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654321', '654321', '布尔津县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654322', '654322', '富蕴县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654323', '654323', '福海县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654324', '654324', '哈巴河县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654325', '654325', '青河县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('654326', '654326', '吉木乃县', '6543', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('6590', '6590', '自治区直辖县级行政区划', '65', 2); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659001', '659001', '石河子市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659002', '659002', '阿拉尔市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659003', '659003', '图木舒克市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659004', '659004', '五家渠市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659005', '659005', '北屯市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659006', '659006', '铁门关市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659007', '659007', '双河市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659008', '659008', '可克达拉市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659009', '659009', '昆玉市', '6590', 3); +INSERT INTO `dic_city` (`id`, `code`, `name`, `parent_id`, `level`) VALUES ('659010', '659010', '胡杨河市', '6590', 3); +COMMIT; -- ---------------------------- -- Table structure for gen_create_column_config -- ---------------------------- DROP TABLE IF EXISTS `gen_create_column_config`; -CREATE TABLE `gen_create_column_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `required` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否必填', +CREATE TABLE `gen_create_column_config` ( + `id` varchar(32) NOT NULL, + `required` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否必填', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '新增功能代码生成配置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='新增功能代码生成配置'; -- ---------------------------- -- Records of gen_create_column_config -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_form -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_form`; -CREATE TABLE `gen_custom_form` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `is_dialog` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否对话框表单', - `dialog_tittle` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '对话框标题', - `dialog_width` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '对话框宽度', - `form_config` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单配置', - `prefix_submit` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '前置提交脚本', - `suffix_submit` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '后置提交脚本', - `require_query` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否需要查询', - `query_bean` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '查询数据Bean名称', - `handle_bean` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '操作数据Bean名称', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_form` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `is_dialog` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否对话框表单', + `dialog_tittle` varchar(100) DEFAULT NULL COMMENT '对话框标题', + `dialog_width` varchar(100) DEFAULT '1' COMMENT '对话框宽度', + `form_config` longtext NOT NULL COMMENT '表单配置', + `prefix_submit` longtext COMMENT '前置提交脚本', + `suffix_submit` longtext COMMENT '后置提交脚本', + `require_query` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询', + `query_bean` longtext COMMENT '查询数据Bean名称', + `handle_bean` longtext COMMENT '操作数据Bean名称', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义对话框' ROW_FORMAT = DYNAMIC; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义对话框'; -- ---------------------------- -- Records of gen_custom_form -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_form_category -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_form_category`; -CREATE TABLE `gen_custom_form_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_form_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表分类'; -- ---------------------------- -- Records of gen_custom_form_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list`; -CREATE TABLE `gen_custom_list` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `data_obj_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '数据对象ID', - `list_type` tinyint(3) NOT NULL DEFAULT 0 COMMENT '列表类型', +CREATE TABLE `gen_custom_list` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `data_obj_id` varchar(32) NOT NULL DEFAULT '1' COMMENT '数据对象ID', + `list_type` tinyint(3) NOT NULL DEFAULT '0' COMMENT '列表类型', `label_width` int(11) NOT NULL COMMENT '表单Label宽度', - `has_page` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否分页', - `tree_data` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否树形列表', - `id_column` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ID字段', - `id_column_rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ID字段关联ID', - `tree_pid_column` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID字段', - `tree_pid_column_rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID字段关联ID', - `tree_node_column` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '树形节点字段', - `tree_node_column_rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '树形节点字段关联ID', - `tree_children_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '子节点Key值', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `has_page` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否分页', + `tree_data` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否树形列表', + `id_column` varchar(32) DEFAULT NULL COMMENT 'ID字段', + `id_column_rela_id` varchar(32) DEFAULT NULL COMMENT 'ID字段关联ID', + `tree_pid_column` varchar(32) DEFAULT NULL COMMENT '父级ID字段', + `tree_pid_column_rela_id` varchar(32) DEFAULT NULL COMMENT '父级ID字段关联ID', + `tree_node_column` varchar(32) DEFAULT NULL COMMENT '树形节点字段', + `tree_node_column_rela_id` varchar(32) DEFAULT NULL COMMENT '树形节点字段关联ID', + `tree_children_key` varchar(100) DEFAULT NULL COMMENT '子节点Key值', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `query_prefix_sql` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '查询前置SQL', - `query_suffix_sql` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '查询后置SQL', - `suffix_sql` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '后置SQL', - `allow_export` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否允许导出', + `query_prefix_sql` longtext COMMENT '查询前置SQL', + `query_suffix_sql` longtext COMMENT '查询后置SQL', + `suffix_sql` longtext COMMENT '后置SQL', + `allow_export` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否允许导出', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表' ROW_FORMAT = DYNAMIC; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表'; -- ---------------------------- -- Records of gen_custom_list -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list_category -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list_category`; -CREATE TABLE `gen_custom_list_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_list_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表分类'; -- ---------------------------- -- Records of gen_custom_list_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list_detail -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list_detail`; -CREATE TABLE `gen_custom_list_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `custom_list_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义列表ID', - `rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联ID', - `data_entity_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据实体ID', +CREATE TABLE `gen_custom_list_detail` ( + `id` varchar(32) NOT NULL, + `custom_list_id` varchar(32) NOT NULL COMMENT '自定义列表ID', + `rela_id` varchar(32) DEFAULT NULL COMMENT '关联ID', + `data_entity_id` varchar(32) DEFAULT NULL COMMENT '数据实体ID', `width_type` tinyint(3) NOT NULL COMMENT '宽度类型', `width` int(11) NOT NULL COMMENT '宽度', - `sortable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否页面排序', + `sortable` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否页面排序', `order_no` int(11) NOT NULL COMMENT '排序编号', `type` tinyint(3) NOT NULL COMMENT '类型', - `formatter` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '格式化脚本', + `formatter` longtext COMMENT '格式化脚本', PRIMARY KEY (`id`) USING BTREE, - INDEX `custom_list_id`(`custom_list_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表明细' ROW_FORMAT = DYNAMIC; + KEY `custom_list_id` (`custom_list_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表明细'; -- ---------------------------- -- Records of gen_custom_list_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list_handle_column -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list_handle_column`; -CREATE TABLE `gen_custom_list_handle_column` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `custom_list_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义列表ID', - `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '显示名称', - `view_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '显示类型', +CREATE TABLE `gen_custom_list_handle_column` ( + `id` varchar(32) NOT NULL, + `custom_list_id` varchar(32) NOT NULL COMMENT '自定义列表ID', + `name` varchar(32) NOT NULL COMMENT '显示名称', + `view_type` varchar(20) NOT NULL COMMENT '显示类型', `btn_type` tinyint(3) NOT NULL COMMENT '按钮类型', - `btn_config` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '按钮配置', - `request_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '请求参数', - `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标', + `btn_config` longtext COMMENT '按钮配置', + `request_param` longtext COMMENT '请求参数', + `icon` varchar(100) DEFAULT NULL COMMENT '图标', `width` int(11) NOT NULL COMMENT '宽度', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表工具栏' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表工具栏'; -- ---------------------------- -- Records of gen_custom_list_handle_column -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list_query_params -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list_query_params`; -CREATE TABLE `gen_custom_list_query_params` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `custom_list_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义列表ID', - `rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '关联ID', - `data_entity_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据实体ID', - `front_show` tinyint(1) NOT NULL DEFAULT 1 COMMENT '前端显示', +CREATE TABLE `gen_custom_list_query_params` ( + `id` varchar(32) NOT NULL, + `custom_list_id` varchar(32) NOT NULL COMMENT '自定义列表ID', + `rela_id` varchar(32) NOT NULL COMMENT '关联ID', + `data_entity_id` varchar(32) NOT NULL COMMENT '数据实体ID', + `front_show` tinyint(1) NOT NULL DEFAULT '1' COMMENT '前端显示', `query_type` tinyint(3) NOT NULL COMMENT '查询类型', - `form_width` int(11) NOT NULL DEFAULT 6 COMMENT '表单宽度', - `default_value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '默认值', + `form_width` int(11) NOT NULL DEFAULT '6' COMMENT '表单宽度', + `default_value` longtext COMMENT '默认值', `order_no` int(11) NOT NULL COMMENT '排序编号', `type` tinyint(3) NOT NULL COMMENT '类型', PRIMARY KEY (`id`) USING BTREE, - INDEX `custom_list_id`(`custom_list_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表查询参数' ROW_FORMAT = DYNAMIC; + KEY `custom_list_id` (`custom_list_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表查询参数'; -- ---------------------------- -- Records of gen_custom_list_query_params -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_list_toolbar -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_list_toolbar`; -CREATE TABLE `gen_custom_list_toolbar` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `custom_list_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义列表ID', - `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '显示名称', - `view_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '显示类型', +CREATE TABLE `gen_custom_list_toolbar` ( + `id` varchar(32) NOT NULL, + `custom_list_id` varchar(32) NOT NULL COMMENT '自定义列表ID', + `name` varchar(32) NOT NULL COMMENT '显示名称', + `view_type` varchar(20) NOT NULL COMMENT '显示类型', `btn_type` tinyint(3) NOT NULL COMMENT '按钮类型', - `btn_config` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '按钮配置', - `request_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '请求参数', - `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标', + `btn_config` longtext COMMENT '按钮配置', + `request_param` longtext COMMENT '请求参数', + `icon` varchar(100) DEFAULT NULL COMMENT '图标', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义列表工具栏' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义列表工具栏'; -- ---------------------------- -- Records of gen_custom_list_toolbar -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_page -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_page`; -CREATE TABLE `gen_custom_page` ( +CREATE TABLE `gen_custom_page` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `page_code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '页面代码', - `script_code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '脚本代码', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `page_code` longtext NOT NULL COMMENT '页面代码', + `script_code` longtext COMMENT '脚本代码', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义页面' ROW_FORMAT = Dynamic; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义页面'; -- ---------------------------- -- Records of gen_custom_page -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_page_category -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_page_category`; -CREATE TABLE `gen_custom_page_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_page_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `parent_id` varchar(32) DEFAULT NULL COMMENT '父级ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义页面分类' ROW_FORMAT = Dynamic; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义页面分类'; -- ---------------------------- -- Records of gen_custom_page_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_selector -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_selector`; -CREATE TABLE `gen_custom_selector` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `custom_list_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '数据对象ID', - `dialog_tittle` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '对话框标题', - `dialog_width` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '对话框宽度', - `placeholder` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '占位符', - `id_column` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ID字段', - `id_column_rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ID字段关联ID', - `name_column` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称ID字段', - `name_column_rela_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称ID字段关联ID', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_selector` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `custom_list_id` varchar(32) NOT NULL DEFAULT '1' COMMENT '数据对象ID', + `dialog_tittle` varchar(100) DEFAULT NULL COMMENT '对话框标题', + `dialog_width` varchar(100) NOT NULL DEFAULT '1' COMMENT '对话框宽度', + `placeholder` varchar(100) DEFAULT NULL COMMENT '占位符', + `id_column` varchar(32) DEFAULT NULL COMMENT 'ID字段', + `id_column_rela_id` varchar(32) DEFAULT NULL COMMENT 'ID字段关联ID', + `name_column` varchar(32) DEFAULT NULL COMMENT '名称ID字段', + `name_column_rela_id` varchar(32) DEFAULT NULL COMMENT '名称ID字段关联ID', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义对话框' ROW_FORMAT = DYNAMIC; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义对话框'; -- ---------------------------- -- Records of gen_custom_selector -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_custom_selector_category -- ---------------------------- DROP TABLE IF EXISTS `gen_custom_selector_category`; -CREATE TABLE `gen_custom_selector_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_custom_selector_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '自定义对话框分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='自定义对话框分类'; -- ---------------------------- -- Records of gen_custom_selector_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_entity -- ---------------------------- DROP TABLE IF EXISTS `gen_data_entity`; -CREATE TABLE `gen_data_entity` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_data_entity` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `gen_status` tinyint(3) NOT NULL DEFAULT 1 COMMENT '状态', - `table_schema` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据表所属的数据库名', - `table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据库表名', - `engine` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据库引擎', - `table_collation` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字符校验编码集', - `table_comment` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '备注', + `gen_status` tinyint(3) NOT NULL DEFAULT '1' COMMENT '状态', + `table_schema` varchar(64) NOT NULL COMMENT '数据表所属的数据库名', + `table_name` varchar(64) NOT NULL COMMENT '数据库表名', + `engine` varchar(64) DEFAULT NULL COMMENT '数据库引擎', + `table_collation` varchar(32) DEFAULT NULL COMMENT '字符校验编码集', + `table_comment` varchar(2048) NOT NULL COMMENT '备注', `convert_type` tinyint(3) NOT NULL COMMENT '转换方式', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据实体' ROW_FORMAT = DYNAMIC; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据实体'; -- ---------------------------- -- Records of gen_data_entity -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_entity_category -- ---------------------------- DROP TABLE IF EXISTS `gen_data_entity_category`; -CREATE TABLE `gen_data_entity_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_data_entity_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据实体分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据实体分类'; -- ---------------------------- -- Records of gen_data_entity_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_entity_detail -- ---------------------------- DROP TABLE IF EXISTS `gen_data_entity_detail`; -CREATE TABLE `gen_data_entity_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `entity_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '实体ID', - `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段显示名称', - `column_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段名称', - `is_key` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否主键', +CREATE TABLE `gen_data_entity_detail` ( + `id` varchar(32) NOT NULL, + `entity_id` varchar(32) NOT NULL COMMENT '实体ID', + `name` varchar(64) NOT NULL COMMENT '字段显示名称', + `column_name` varchar(64) NOT NULL COMMENT '字段名称', + `is_key` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否主键', `data_type` tinyint(3) NOT NULL COMMENT '数据类型', `column_order` int(11) NOT NULL COMMENT '排序编号', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `view_type` tinyint(3) NOT NULL COMMENT '显示类型', - `data_dic_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据字典ID', - `custom_selector_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '自定义选择器ID', - `fix_enum` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否内置枚举', - `enum_back` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '后端枚举名', - `enum_front` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '前端枚举名', - `regular_expression` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '正则表达式', - `is_order` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否排序字段', - `order_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '排序类型', - `len` bigint(20) NULL DEFAULT NULL COMMENT '长度', - `decimals` int(11) NULL DEFAULT NULL COMMENT '小数位数', - `db_column_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段名', - `db_data_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段数据类型', - `is_nullable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否允许为空', - `column_default` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '默认值', - `ordinal_position` bigint(21) UNSIGNED NOT NULL DEFAULT 0 COMMENT '字段排序', - `column_comment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段备注', - `db_len` bigint(20) NULL DEFAULT NULL COMMENT '长度', - `db_decimals` int(11) NULL DEFAULT NULL COMMENT '小数位数', + `data_dic_id` varchar(32) DEFAULT NULL COMMENT '数据字典ID', + `custom_selector_id` varchar(32) DEFAULT NULL COMMENT '自定义选择器ID', + `fix_enum` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否内置枚举', + `enum_back` varchar(200) DEFAULT NULL COMMENT '后端枚举名', + `enum_front` varchar(200) DEFAULT NULL COMMENT '前端枚举名', + `regular_expression` varchar(200) DEFAULT NULL COMMENT '正则表达式', + `is_order` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否排序字段', + `order_type` varchar(20) DEFAULT NULL COMMENT '排序类型', + `len` bigint(20) DEFAULT NULL COMMENT '长度', + `decimals` int(11) DEFAULT NULL COMMENT '小数位数', + `db_column_name` varchar(64) NOT NULL COMMENT '字段名', + `db_data_type` varchar(64) NOT NULL DEFAULT '' COMMENT '字段数据类型', + `is_nullable` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否允许为空', + `column_default` longtext COMMENT '默认值', + `ordinal_position` bigint(21) unsigned NOT NULL DEFAULT '0' COMMENT '字段排序', + `column_comment` varchar(1024) NOT NULL DEFAULT '' COMMENT '字段备注', + `db_len` bigint(20) DEFAULT NULL COMMENT '长度', + `db_decimals` int(11) DEFAULT NULL COMMENT '小数位数', PRIMARY KEY (`id`) USING BTREE, - INDEX `entity_id`(`entity_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据实体明细' ROW_FORMAT = DYNAMIC; + KEY `entity_id` (`entity_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据实体明细'; -- ---------------------------- -- Records of gen_data_entity_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_obj -- ---------------------------- DROP TABLE IF EXISTS `gen_data_obj`; -CREATE TABLE `gen_data_obj` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `main_table_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '主表ID', - `main_table_alias` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主表别名', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_data_obj` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `main_table_id` varchar(32) NOT NULL DEFAULT '1' COMMENT '主表ID', + `main_table_alias` varchar(200) NOT NULL COMMENT '主表别名', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据对象' ROW_FORMAT = DYNAMIC; + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据对象'; -- ---------------------------- -- Records of gen_data_obj -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_obj_category -- ---------------------------- DROP TABLE IF EXISTS `gen_data_obj_category`; -CREATE TABLE `gen_data_obj_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `gen_data_obj_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据实体分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据实体分类'; -- ---------------------------- -- Records of gen_data_obj_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_obj_detail -- ---------------------------- DROP TABLE IF EXISTS `gen_data_obj_detail`; -CREATE TABLE `gen_data_obj_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `data_obj_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据对象ID', - `main_table_detail_ids` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主表字段', +CREATE TABLE `gen_data_obj_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `data_obj_id` varchar(32) NOT NULL COMMENT '数据对象ID', + `main_table_detail_ids` longtext NOT NULL COMMENT '主表字段', `rela_type` tinyint(3) NOT NULL COMMENT '关联类型', `rela_mode` tinyint(3) NOT NULL COMMENT '关联方式', - `sub_table_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子表ID', - `sub_table_alias` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子表别名', - `sub_table_detail_ids` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子表字段', + `sub_table_id` varchar(32) NOT NULL COMMENT '子表ID', + `sub_table_alias` varchar(200) NOT NULL COMMENT '子表别名', + `sub_table_detail_ids` longtext NOT NULL COMMENT '子表字段', `order_no` int(11) NOT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - INDEX `data_obj_id`(`data_obj_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据对象明细' ROW_FORMAT = DYNAMIC; + KEY `data_obj_id` (`data_obj_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据对象明细'; -- ---------------------------- -- Records of gen_data_obj_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_data_obj_query_detail -- ---------------------------- DROP TABLE IF EXISTS `gen_data_obj_query_detail`; -CREATE TABLE `gen_data_obj_query_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `data_obj_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据对象ID', - `custom_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '显示名称', - `custom_sql` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义SQL', - `custom_alias` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '自定义别名', +CREATE TABLE `gen_data_obj_query_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `data_obj_id` varchar(32) NOT NULL COMMENT '数据对象ID', + `custom_name` varchar(200) NOT NULL COMMENT '显示名称', + `custom_sql` longtext NOT NULL COMMENT '自定义SQL', + `custom_alias` varchar(200) NOT NULL COMMENT '自定义别名', `data_type` tinyint(3) NOT NULL COMMENT '数据类型', `order_no` int(11) NOT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - INDEX `data_obj_id`(`data_obj_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据对象自定义查询明细' ROW_FORMAT = DYNAMIC; + KEY `data_obj_id` (`data_obj_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据对象自定义查询明细'; -- ---------------------------- -- Records of gen_data_obj_query_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_detail_column_config -- ---------------------------- DROP TABLE IF EXISTS `gen_detail_column_config`; -CREATE TABLE `gen_detail_column_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `gen_detail_column_config` ( + `id` varchar(32) NOT NULL, `span` int(11) NOT NULL COMMENT '列宽', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '详情功能代码生成配置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='详情功能代码生成配置'; -- ---------------------------- -- Records of gen_detail_column_config -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_generate_info -- ---------------------------- DROP TABLE IF EXISTS `gen_generate_info`; -CREATE TABLE `gen_generate_info` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `gen_generate_info` ( + `id` varchar(32) NOT NULL, `template_type` tinyint(3) NOT NULL COMMENT '生成模板类型', - `package_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '包名', - `module_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '模块名', - `biz_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务名', - `class_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类名', - `parent_menu_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级菜单ID', + `package_name` varchar(200) NOT NULL COMMENT '包名', + `module_name` varchar(200) NOT NULL COMMENT '模块名', + `biz_name` varchar(200) NOT NULL COMMENT '业务名', + `class_name` varchar(200) NOT NULL COMMENT '类名', + `parent_menu_id` varchar(32) DEFAULT NULL COMMENT '父级菜单ID', `key_type` tinyint(3) NOT NULL COMMENT '主键类型', - `author` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '作者', - `class_description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类描述', - `menu_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '本级菜单编号', - `menu_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '本级菜单名称', + `author` varchar(100) DEFAULT NULL COMMENT '作者', + `class_description` varchar(200) NOT NULL COMMENT '类描述', + `menu_code` varchar(20) NOT NULL COMMENT '本级菜单编号', + `menu_name` varchar(200) NOT NULL COMMENT '本级菜单名称', `detail_span` int(11) NOT NULL COMMENT '详情页Span总数量', - `is_cache` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否应用缓存', - `has_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否内置删除功能', + `is_cache` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否应用缓存', + `has_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否内置删除功能', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成基本信息' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='代码生成基本信息'; -- ---------------------------- -- Records of gen_generate_info -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_query_column_config -- ---------------------------- DROP TABLE IF EXISTS `gen_query_column_config`; -CREATE TABLE `gen_query_column_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `gen_query_column_config` ( + `id` varchar(32) NOT NULL, `width_type` tinyint(3) NOT NULL COMMENT '宽度类型', `width` int(11) NOT NULL COMMENT '宽度', - `sortable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否页面排序', + `sortable` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否页面排序', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '查询功能代码生成配置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='查询功能代码生成配置'; -- ---------------------------- -- Records of gen_query_column_config -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_query_params_column_config -- ---------------------------- DROP TABLE IF EXISTS `gen_query_params_column_config`; -CREATE TABLE `gen_query_params_column_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, +CREATE TABLE `gen_query_params_column_config` ( + `id` varchar(32) NOT NULL, `query_type` tinyint(3) NOT NULL COMMENT '查询类型', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '查询参数功能代码生成配置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='查询参数功能代码生成配置'; -- ---------------------------- -- Records of gen_query_params_column_config -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_simple_table -- ---------------------------- DROP TABLE IF EXISTS `gen_simple_table`; -CREATE TABLE `gen_simple_table` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `table_schema` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据表所属的数据库名', - `table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据库表名', - `engine` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据库引擎', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `table_collation` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字符校验编码集', - `table_comment` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '备注', +CREATE TABLE `gen_simple_table` ( + `id` varchar(32) NOT NULL, + `table_schema` varchar(64) NOT NULL COMMENT '数据表所属的数据库名', + `table_name` varchar(64) NOT NULL COMMENT '数据库表名', + `engine` varchar(64) DEFAULT NULL COMMENT '数据库引擎', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `table_collation` varchar(32) DEFAULT NULL COMMENT '字符校验编码集', + `table_comment` varchar(2048) NOT NULL COMMENT '备注', `convert_type` tinyint(3) NOT NULL COMMENT '转换方式', PRIMARY KEY (`id`) USING BTREE, - INDEX `table_schema`(`table_schema`, `table_name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据库单表' ROW_FORMAT = DYNAMIC; + KEY `table_schema` (`table_schema`,`table_name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据库单表'; -- ---------------------------- -- Records of gen_simple_table -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_simple_table_column -- ---------------------------- DROP TABLE IF EXISTS `gen_simple_table_column`; -CREATE TABLE `gen_simple_table_column` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `table_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `column_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段名', - `data_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段数据类型', - `is_nullable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否允许为空', - `is_key` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否主键', - `column_default` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '默认值', - `ordinal_position` bigint(21) UNSIGNED NOT NULL DEFAULT 0 COMMENT '字段排序', - `column_comment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '字段备注', - `len` bigint(20) NULL DEFAULT NULL COMMENT '长度', - `decimals` int(11) NULL DEFAULT NULL COMMENT '小数位数', +CREATE TABLE `gen_simple_table_column` ( + `id` varchar(32) NOT NULL, + `table_id` varchar(32) NOT NULL, + `column_name` varchar(64) NOT NULL COMMENT '字段名', + `data_type` varchar(64) NOT NULL DEFAULT '' COMMENT '字段数据类型', + `is_nullable` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否允许为空', + `is_key` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否主键', + `column_default` longtext COMMENT '默认值', + `ordinal_position` bigint(21) unsigned NOT NULL DEFAULT '0' COMMENT '字段排序', + `column_comment` varchar(1024) NOT NULL DEFAULT '' COMMENT '字段备注', + `len` bigint(20) DEFAULT NULL COMMENT '长度', + `decimals` int(11) DEFAULT NULL COMMENT '小数位数', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据库单表列信息' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据库单表列信息'; -- ---------------------------- -- Records of gen_simple_table_column -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for gen_update_column_config -- ---------------------------- DROP TABLE IF EXISTS `gen_update_column_config`; -CREATE TABLE `gen_update_column_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `required` tinyint(1) NOT NULL DEFAULT 0, +CREATE TABLE `gen_update_column_config` ( + `id` varchar(32) NOT NULL, + `required` tinyint(1) NOT NULL DEFAULT '0', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '修改功能代码生成配置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='修改功能代码生成配置'; -- ---------------------------- -- Records of gen_update_column_config -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for op_logs -- ---------------------------- DROP TABLE IF EXISTS `op_logs`; -CREATE TABLE `op_logs` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '日志名称', +CREATE TABLE `op_logs` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(200) NOT NULL COMMENT '日志名称', `log_type` int(11) NOT NULL COMMENT '类别', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `extra` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '补充信息', - `ip` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'IP地址', + `extra` longtext COMMENT '补充信息', + `ip` varchar(100) NOT NULL COMMENT 'IP地址', PRIMARY KEY (`id`) USING BTREE, - INDEX `create_by`(`create_by`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; + KEY `create_by` (`create_by`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='操作日志'; -- ---------------------------- -- Records of op_logs -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for recursion_mapping -- ---------------------------- DROP TABLE IF EXISTS `recursion_mapping`; -CREATE TABLE `recursion_mapping` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `node_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '节点ID', +CREATE TABLE `recursion_mapping` ( + `id` varchar(32) NOT NULL, + `node_id` varchar(32) NOT NULL COMMENT '节点ID', `node_type` tinyint(3) NOT NULL COMMENT '节点类型', - `path` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '从顶点到当前结点的路径，用,分割', + `path` longtext COMMENT '从顶点到当前结点的路径，用,分割', `level` int(11) NOT NULL COMMENT '节点层级', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `node_id`(`node_id`, `node_type`) USING BTREE, - INDEX `node_type`(`node_type`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '树形数据节点关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `node_id` (`node_id`,`node_type`) USING BTREE, + KEY `node_type` (`node_type`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='树形数据节点关系表'; -- ---------------------------- -- Records of recursion_mapping -- ---------------------------- -INSERT INTO `recursion_mapping` VALUES ('1', '2', 1, NULL, 1); -INSERT INTO `recursion_mapping` VALUES ('2', '4', 1, '2', 2); -INSERT INTO `recursion_mapping` VALUES ('3', '3', 1, '1', 2); -INSERT INTO `recursion_mapping` VALUES ('4', '1', 1, NULL, 1); +BEGIN; +INSERT INTO `recursion_mapping` (`id`, `node_id`, `node_type`, `path`, `level`) VALUES ('1', '2', 1, NULL, 1); +INSERT INTO `recursion_mapping` (`id`, `node_id`, `node_type`, `path`, `level`) VALUES ('2', '4', 1, '2', 2); +INSERT INTO `recursion_mapping` (`id`, `node_id`, `node_type`, `path`, `level`) VALUES ('3', '3', 1, '1', 2); +INSERT INTO `recursion_mapping` (`id`, `node_id`, `node_type`, `path`, `level`) VALUES ('4', '1', 1, NULL, 1); +COMMIT; -- ---------------------------- -- Table structure for settle_check_sheet -- ---------------------------- DROP TABLE IF EXISTS `settle_check_sheet`; -CREATE TABLE `settle_check_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `total_pay_amount` decimal(24, 2) NOT NULL COMMENT '应付金额', - `total_payed_amount` decimal(24, 2) NOT NULL COMMENT '已付金额', - `total_discount_amount` decimal(24, 2) NOT NULL COMMENT '已优惠金额', +CREATE TABLE `settle_check_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `total_pay_amount` decimal(24,2) NOT NULL COMMENT '应付金额', + `total_payed_amount` decimal(24,2) NOT NULL COMMENT '已付金额', + `total_discount_amount` decimal(24,2) NOT NULL COMMENT '已优惠金额', `start_date` date NOT NULL COMMENT '起始日期', `end_date` date NOT NULL COMMENT '截止日期', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商对账单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商对账单'; -- ---------------------------- -- Records of settle_check_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_check_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `settle_check_sheet_detail`; -CREATE TABLE `settle_check_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对账单ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', +CREATE TABLE `settle_check_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '对账单ID', + `biz_id` varchar(32) NOT NULL COMMENT '单据ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', `calc_type` tinyint(3) NOT NULL COMMENT '计算类型', - `pay_amount` decimal(24, 2) NOT NULL COMMENT '应付金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `pay_amount` decimal(24,2) NOT NULL COMMENT '应付金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `biz_id`) USING BTREE, - INDEX `biz_id`(`biz_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商对账单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`biz_id`) USING BTREE, + KEY `biz_id` (`biz_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商对账单明细'; -- ---------------------------- -- Records of settle_check_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_fee_sheet -- ---------------------------- DROP TABLE IF EXISTS `settle_fee_sheet`; -CREATE TABLE `settle_fee_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', +CREATE TABLE `settle_fee_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', `sheet_type` tinyint(3) NOT NULL COMMENT '单据类型', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商费用单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商费用单'; -- ---------------------------- -- Records of settle_fee_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_fee_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `settle_fee_sheet_detail`; -CREATE TABLE `settle_fee_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '费用单ID', - `item_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID', - `amount` decimal(24, 2) NOT NULL COMMENT '金额', +CREATE TABLE `settle_fee_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '费用单ID', + `item_id` varchar(32) NOT NULL COMMENT '项目ID', + `amount` decimal(24,2) NOT NULL COMMENT '金额', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `item_id`) USING BTREE, - INDEX `item_id`(`item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商费用单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`item_id`) USING BTREE, + KEY `item_id` (`item_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商费用单明细'; -- ---------------------------- -- Records of settle_fee_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_in_item -- ---------------------------- DROP TABLE IF EXISTS `settle_in_item`; -CREATE TABLE `settle_in_item` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', +CREATE TABLE `settle_in_item` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '收入项目' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='收入项目'; -- ---------------------------- -- Records of settle_in_item -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_out_item -- ---------------------------- DROP TABLE IF EXISTS `settle_out_item`; -CREATE TABLE `settle_out_item` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', +CREATE TABLE `settle_out_item` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支出项目' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支出项目'; -- ---------------------------- -- Records of settle_out_item -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_pre_sheet -- ---------------------------- DROP TABLE IF EXISTS `settle_pre_sheet`; -CREATE TABLE `settle_pre_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `settle_pre_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商预付款单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商预付款单'; -- ---------------------------- -- Records of settle_pre_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_pre_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `settle_pre_sheet_detail`; -CREATE TABLE `settle_pre_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预付款单ID', - `item_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目ID', - `amount` decimal(24, 2) NOT NULL COMMENT '金额', +CREATE TABLE `settle_pre_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '预付款单ID', + `item_id` varchar(32) NOT NULL COMMENT '项目ID', + `amount` decimal(24,2) NOT NULL COMMENT '金额', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `item_id`) USING BTREE, - INDEX `item_id`(`item_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商预付款单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`item_id`) USING BTREE, + KEY `item_id` (`item_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商预付款单明细'; -- ---------------------------- -- Records of settle_pre_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_sheet -- ---------------------------- DROP TABLE IF EXISTS `settle_sheet`; -CREATE TABLE `settle_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '总金额', - `total_discount_amount` decimal(24, 2) NOT NULL COMMENT '已优惠金额', +CREATE TABLE `settle_sheet` ( + `id` varchar(32) NOT NULL, + `code` varchar(32) NOT NULL COMMENT '单号', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '总金额', + `total_discount_amount` decimal(24,2) NOT NULL COMMENT '已优惠金额', `start_date` date NOT NULL COMMENT '起始日期', `end_date` date NOT NULL COMMENT '截止日期', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商结算单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商结算单'; -- ---------------------------- -- Records of settle_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for settle_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `settle_sheet_detail`; -CREATE TABLE `settle_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '结算单ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', - `pay_amount` decimal(24, 2) NOT NULL COMMENT '实付金额', - `discount_amount` decimal(24, 2) NOT NULL COMMENT '优惠金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', +CREATE TABLE `settle_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '结算单ID', + `biz_id` varchar(32) NOT NULL COMMENT '单据ID', + `pay_amount` decimal(24,2) NOT NULL COMMENT '实付金额', + `discount_amount` decimal(24,2) NOT NULL COMMENT '优惠金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `biz_id`) USING BTREE, - INDEX `biz_id`(`biz_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '供应商结算单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`biz_id`) USING BTREE, + KEY `biz_id` (`biz_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='供应商结算单明细'; -- ---------------------------- -- Records of settle_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sw_file_box -- ---------------------------- DROP TABLE IF EXISTS `sw_file_box`; -CREATE TABLE `sw_file_box` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `url` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'Url', - `content_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'ContentType', +CREATE TABLE `sw_file_box` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(200) NOT NULL COMMENT '名称', + `url` longtext COMMENT 'Url', + `content_type` varchar(200) DEFAULT NULL COMMENT 'ContentType', `file_type` tinyint(3) NOT NULL COMMENT '文件类型', - `file_size` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件大小', - `file_path` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文件路径', - `file_suffix` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件后缀', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `file_size` varchar(200) DEFAULT NULL COMMENT '文件大小', + `file_path` longtext NOT NULL COMMENT '文件路径', + `file_suffix` varchar(200) DEFAULT NULL COMMENT '文件后缀', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文件收纳箱' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='文件收纳箱'; -- ---------------------------- -- Records of sw_file_box -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sw_online_excel -- ---------------------------- DROP TABLE IF EXISTS `sw_online_excel`; -CREATE TABLE `sw_online_excel` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态 1-在用 0停用', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `sw_online_excel` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `name` varchar(200) NOT NULL COMMENT '名称', + `content` longtext NOT NULL COMMENT '内容', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 1-在用 0停用', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '在线Excel' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='在线Excel'; -- ---------------------------- -- Records of sw_online_excel -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_data_dic -- ---------------------------- DROP TABLE IF EXISTS `sys_data_dic`; -CREATE TABLE `sys_data_dic` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `category_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类ID', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `sys_data_dic` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `category_id` varchar(32) DEFAULT NULL COMMENT '分类ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `name`(`name`) USING BTREE, - INDEX `category_id`(`category_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据字典' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `name` (`name`) USING BTREE, + KEY `category_id` (`category_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据字典'; -- ---------------------------- -- Records of sys_data_dic -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_data_dic_category -- ---------------------------- DROP TABLE IF EXISTS `sys_data_dic_category`; -CREATE TABLE `sys_data_dic_category` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `sys_data_dic_category` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据字典分类' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据字典分类'; -- ---------------------------- -- Records of sys_data_dic_category -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_data_dic_item -- ---------------------------- DROP TABLE IF EXISTS `sys_data_dic_item`; -CREATE TABLE `sys_data_dic_item` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `dic_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字典ID', +CREATE TABLE `sys_data_dic_item` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `dic_id` varchar(32) NOT NULL COMMENT '字典ID', `order_no` int(11) NOT NULL COMMENT '排序编号', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `dic_id`(`dic_id`, `code`) USING BTREE, - UNIQUE INDEX `dic_id_2`(`dic_id`, `name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据字典' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `dic_id` (`dic_id`,`code`) USING BTREE, + UNIQUE KEY `dic_id_2` (`dic_id`,`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据字典'; -- ---------------------------- -- Records of sys_data_dic_item -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_data_permission_data -- ---------------------------- DROP TABLE IF EXISTS `sys_data_permission_data`; -CREATE TABLE `sys_data_permission_data` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务ID', +CREATE TABLE `sys_data_permission_data` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `biz_id` varchar(32) NOT NULL COMMENT '业务ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', `permission_type` tinyint(3) NOT NULL COMMENT '权限类型', - `permission` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据权限', + `permission` longtext NOT NULL COMMENT '数据权限', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `biz_id`(`biz_id`, `biz_type`, `permission_type`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据权限数据' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `biz_id` (`biz_id`,`biz_type`,`permission_type`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据权限数据'; -- ---------------------------- -- Records of sys_data_permission_data -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_data_permission_model_detail -- ---------------------------- DROP TABLE IF EXISTS `sys_data_permission_model_detail`; -CREATE TABLE `sys_data_permission_model_detail` ( +CREATE TABLE `sys_data_permission_model_detail` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', + `name` varchar(20) NOT NULL COMMENT '名称', `model_id` int(11) NOT NULL COMMENT '模型ID', - `condition_type` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '条件', + `condition_type` longtext NOT NULL COMMENT '条件', `input_type` tinyint(3) NOT NULL COMMENT '输入类型', - `table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表名', - `column_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段名', - `enum_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '前端枚举名', - `sql_value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL', + `table_name` varchar(200) NOT NULL COMMENT '表名', + `column_name` varchar(200) NOT NULL COMMENT '字段名', + `enum_name` varchar(200) DEFAULT NULL COMMENT '前端枚举名', + `sql_value` longtext COMMENT 'SQL', PRIMARY KEY (`id`) USING BTREE, - INDEX `model_id`(`model_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据权限模型明细' ROW_FORMAT = DYNAMIC; + KEY `model_id` (`model_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数据权限模型明细'; -- ---------------------------- -- Records of sys_data_permission_model_detail -- ---------------------------- -INSERT INTO `sys_data_permission_model_detail` VALUES (1, '编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (2, '名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'name', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (3, '简称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'short_name', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (4, 'SKU', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'sku_code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (5, '外部编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'external_code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (6, '品类编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (7, '品类名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'name', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (8, '品牌编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'brand', 'code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (9, '品牌名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'brand', 'name', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (10, '规格', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'spec', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (11, '单位', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'unit', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (12, '状态', 1, '0,5,6,7', 1, 'product', 'available', 'AVAILABLE', NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (13, '创建时间', 1, '0,1,2,3,4,5', 2, 'product', 'create_time', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (14, '创建人部门与本人相同', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN ({__var#curDeptIds})'); -INSERT INTO `sys_data_permission_model_detail` VALUES (15, '创建人部门是本人的上级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE FIND_IN_SET(__ud.dept_id,(SELECT GROUP_CONCAT(__mp.path) FROM sys_dept AS __d INNER JOIN recursion_mapping AS __mp ON __mp.node_id=__d.id AND __mp.node_type=1 WHERE __d.id IN ({__var#curDeptIds}) AND __mp.level> 1))'); -INSERT INTO `sys_data_permission_model_detail` VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE FIND_IN_SET((SELECT __d.id FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds})),__mp.path) AND __mp.node_type=1)'); -INSERT INTO `sys_data_permission_model_detail` VALUES (17, '创建时间', 2, '0,1,2,3,4,5', 2, 'order', 'create_time', NULL, NULL); +BEGIN; +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (1, '编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (2, '名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'name', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (3, '简称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'short_name', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (4, 'SKU', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'sku_code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (5, '简码', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'external_code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (6, '品类编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (7, '品类名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'name', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (8, '品牌编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'brand', 'code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (9, '品牌名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'brand', 'name', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (10, '规格', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'spec', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (11, '单位', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'unit', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (12, '状态', 1, '0,5,6,7', 1, 'product', 'available', 'AVAILABLE', NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (13, '创建时间', 1, '0,1,2,3,4,5', 2, 'product', 'create_time', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (14, '创建人部门与本人相同', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN ({__var#curDeptIds})'); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (15, '创建人部门是本人的上级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE FIND_IN_SET(__ud.dept_id,(SELECT GROUP_CONCAT(__mp.path) FROM sys_dept AS __d INNER JOIN recursion_mapping AS __mp ON __mp.node_id=__d.id AND __mp.node_type=1 WHERE __d.id IN ({__var#curDeptIds}) AND __mp.level> 1))'); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE FIND_IN_SET((SELECT __d.id FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds})),__mp.path) AND __mp.node_type=1)'); +INSERT INTO `sys_data_permission_model_detail` (`id`, `name`, `model_id`, `condition_type`, `input_type`, `table_name`, `column_name`, `enum_name`, `sql_value`) VALUES (17, '创建时间', 2, '0,1,2,3,4,5', 2, 'order', 'create_time', NULL, NULL); +COMMIT; -- ---------------------------- -- Table structure for sys_dept -- ---------------------------- DROP TABLE IF EXISTS `sys_dept`; -CREATE TABLE `sys_dept` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `short_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '简称', - `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID', +CREATE TABLE `sys_dept` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(100) NOT NULL COMMENT '名称', + `short_name` varchar(20) NOT NULL COMMENT '简称', + `parent_id` varchar(32) DEFAULT NULL COMMENT '父级ID', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `name` (`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='部门'; -- ---------------------------- -- Records of sys_dept -- ---------------------------- -INSERT INTO `sys_dept` VALUES ('1', '001', '销售中心', '销售中心', NULL, 1, '', '系统管理员', '1', '2022-01-13 00:37:06', '系统管理员', '1', '2022-01-13 00:37:06'); -INSERT INTO `sys_dept` VALUES ('2', '002', '研发中心', '研发中心', NULL, 1, '', '系统管理员', '1', '2022-01-13 00:37:17', '系统管理员', '1', '2022-01-13 00:37:17'); -INSERT INTO `sys_dept` VALUES ('3', '001001', '销售部', '销售部', '1', 1, '', '系统管理员', '1', '2022-01-13 00:38:03', '系统管理员', '1', '2022-01-13 00:38:03'); -INSERT INTO `sys_dept` VALUES ('4', '002001', '研发部', '研发部', '2', 1, '', '系统管理员', '1', '2022-01-13 00:38:15', '系统管理员', '1', '2022-01-13 00:38:15'); +BEGIN; +INSERT INTO `sys_dept` (`id`, `code`, `name`, `short_name`, `parent_id`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '销售中心', '销售中心', NULL, 1, '', '系统管理员', '1', '2022-01-13 00:37:06', '系统管理员', '1', '2022-01-13 00:37:06'); +INSERT INTO `sys_dept` (`id`, `code`, `name`, `short_name`, `parent_id`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2', '002', '研发中心', '研发中心', NULL, 1, '', '系统管理员', '1', '2022-01-13 00:37:17', '系统管理员', '1', '2022-01-13 00:37:17'); +INSERT INTO `sys_dept` (`id`, `code`, `name`, `short_name`, `parent_id`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3', '001001', '销售部', '销售部', '1', 1, '', '系统管理员', '1', '2022-01-13 00:38:03', '系统管理员', '1', '2022-01-13 00:38:03'); +INSERT INTO `sys_dept` (`id`, `code`, `name`, `short_name`, `parent_id`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4', '002001', '研发部', '研发部', '2', 1, '', '系统管理员', '1', '2022-01-13 00:38:15', '系统管理员', '1', '2022-01-13 00:38:15'); +COMMIT; + +-- ---------------------------- +-- Table structure for sys_generate_code +-- ---------------------------- +DROP TABLE IF EXISTS `sys_generate_code`; +CREATE TABLE `sys_generate_code` ( + `id` int(11) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `config_str` longtext NOT NULL COMMENT '配置信息（JSONArray）', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- ---------------------------- +-- Records of sys_generate_code +-- ---------------------------- +BEGIN; +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (1, '用户编号', '[{\"type\":6,\"val\":\"R\"},{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"58aabb1d160430444158d82e4c86cb9c7f2a\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (200, '采购订单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"37366f903834c842d5e8144bd707bdb77e35\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (201, '采购收货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"12099be638c90d466b2a4af5465ed632459f\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (202, '采购退单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"60fdc467f35db94c8569f6ed68d103ce5452\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (203, '销售订单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d141ddad1cea5344ebe85ac6d3c6550a9d5b\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (204, '销售出库单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"2bec018f14b3d647b9e8641a408dcecf58bc\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (205, '销售退货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"240604dc9024834d9d29abf86dd6bf7f3989\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (206, '零售出库单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"60ecbed8c835454552f8c177c69c155bdaf8\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (207, '零售退货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"8307f839bd2e24426de87884fc034fe8d546\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (208, '预先盘点单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"5142a4fc6392764d35bb852e9dcfe544a482\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (209, '盘点任务号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"e0937a56dc47a6437c1840195ab26a454db6\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (210, '盘点单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d5a2827d3b2f6844aae858e6cb62449a3283\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (212, '库存调整单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"10787084f2177b430709b260f42085ce14e9\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (213, '仓库调拨单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"3b0668d95c93234ca65a6afa6f5c333819ea\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (214, '物流单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"f693245a4a05ab4e7f19362e45e09da59d74\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (300, '供应商对账单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"89398b781627df40f6fbfdab81fc7ab83c05\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (301, '供应商费用单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"286289a735b3f24859a91db603b14e48df4e\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (302, '供应商付款单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"f7ed22483ab83a435218cd0af3b6102fa308\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (303, '供应商结算单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"741524aed5dbd1452acbe05bf63a35d8bbeb\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (304, '客户对账单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d8bddcd37139d24bb12ae66b0f6732eecef9\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (305, '客户费用单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"37f9d9a53699d042088918afe08d7de15d82\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (306, '客户预付款单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"9a2cb171fd93464fb76928b35f77d0045b32\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (307, '客户结算单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"e63f16fc2acf984c3e9bef378e6ea4546204\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +COMMIT; + +-- ---------------------------- +-- Table structure for sys_mail_message +-- ---------------------------- +DROP TABLE IF EXISTS `sys_mail_message`; +CREATE TABLE `sys_mail_message` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `title` varchar(100) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `mail` varchar(100) NOT NULL COMMENT '邮箱', + `biz_key` varchar(20) NOT NULL COMMENT '业务键', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `send_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '发送状态', + PRIMARY KEY (`id`), + KEY `mail` (`mail`), + KEY `biz_key` (`biz_key`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='邮件消息'; + +-- ---------------------------- +-- Records of sys_mail_message +-- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_menu -- ---------------------------- DROP TABLE IF EXISTS `sys_menu`; -CREATE TABLE `sys_menu` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称（前端使用）', - `title` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', - `icon` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图标', - `component_type` tinyint(3) NULL DEFAULT NULL COMMENT '组件类型（前端使用）', - `component` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组件（前端使用）', - `request_param` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '自定义请求参数', - `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父级ID', - `sys_module_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '系统模块ID', - `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '路由路径（前端使用）', - `no_cache` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否缓存（前端使用）', +CREATE TABLE `sys_menu` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(200) DEFAULT NULL COMMENT '名称（前端使用）', + `title` varchar(20) NOT NULL COMMENT '标题', + `icon` varchar(200) DEFAULT NULL COMMENT '图标', + `component_type` tinyint(3) DEFAULT NULL COMMENT '组件类型（前端使用）', + `component` varchar(200) DEFAULT NULL COMMENT '组件（前端使用）', + `request_param` longtext COMMENT '自定义请求参数', + `parent_id` varchar(32) DEFAULT NULL COMMENT '父级ID', + `sys_module_id` varchar(32) DEFAULT NULL COMMENT '系统模块ID', + `path` varchar(200) DEFAULT NULL COMMENT '路由路径（前端使用）', + `no_cache` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否缓存（前端使用）', `display` tinyint(3) NOT NULL COMMENT '类型 0-目录 1-菜单 2-功能', - `hidden` tinyint(1) NULL DEFAULT 0 COMMENT '是否隐藏（前端使用）', - `permission` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限', - `is_special` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否特殊菜单', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `hidden` tinyint(1) DEFAULT '0' COMMENT '是否隐藏（前端使用）', + `permission` varchar(200) DEFAULT NULL COMMENT '权限', + `is_special` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否特殊菜单', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人ID', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人ID', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `code`(`code`, `name`, `title`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单' ROW_FORMAT = DYNAMIC; + KEY `code` (`code`,`name`,`title`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='菜单'; -- ---------------------------- -- Records of sys_menu -- ---------------------------- -INSERT INTO `sys_menu` VALUES ('1000', '1000', 'System', '系统管理', 'ant-design:setting-outlined', NULL, '', NULL, NULL, '2', '/system', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2023-10-27 17:01:09'); -INSERT INTO `sys_menu` VALUES ('1000001', '1000001', 'Menu', '菜单管理', NULL, 0, '/system/menu/index', NULL, '1000', '2', '/menu', 0, 1, 0, 'system:menu:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2023-10-27 17:01:09'); -INSERT INTO `sys_menu` VALUES ('1000001001', '1000001001', '', '新增菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2023-10-27 17:01:09'); -INSERT INTO `sys_menu` VALUES ('1000001002', '1000001002', '', '修改菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000001003', '1000001003', '', '删除菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000002', '1000002', 'Dept', '部门管理', NULL, 0, '/system/dept/index', NULL, '1000', '2', '/dept', 0, 1, 0, 'system:dept:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:09:27', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000002001', '1000002001', '', '新增部门', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:add', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:31', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000002002', '1000002002', '', '修改部门', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:modify', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:47', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000002003', '1000002003', '', '部门权限', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:permission', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:47', '系统管理员', '1', '2023-10-27 17:00:27'); -INSERT INTO `sys_menu` VALUES ('1000003', '1000003', 'Position', '岗位管理', NULL, 0, '/system/position/index', NULL, '1000', '2', '/position', 0, 1, 0, 'system:position:query', 1, 1, '', '系统管理员', '1', '2021-07-01 23:26:17', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000003001', '1000003001', '', '新增岗位', NULL, 0, '', NULL, '1000003', '2', '', 0, 2, 0, 'system:position:add', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:17', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000003002', '1000003002', '', '修改岗位', NULL, 0, '', NULL, '1000003', '2', '', 0, 2, 0, 'system:position:modify', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000004', '1000004', 'Role', '角色管理', NULL, 0, '/system/role/index', NULL, '1000', '2', '/role', 0, 1, 0, 'system:role:query', 1, 1, '', '系统管理员', '1', '2021-07-04 00:35:49', '系统管理员', '1', '2021-07-04 00:35:49'); -INSERT INTO `sys_menu` VALUES ('1000004001', '1000004001', '', '新增角色', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:add', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:17', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000004002', '1000004002', '', '修改角色', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:modify', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000004003', '1000004003', '', '角色授权', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:permission', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000005', '1000005', 'User', '用户管理', NULL, 0, '/system/user/index', NULL, '1000', '2', '/user', 0, 1, 0, 'system:user:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:08:40', '系统管理员', '1', '2021-07-05 01:08:40'); -INSERT INTO `sys_menu` VALUES ('1000005001', '1000005001', '', '新增用户', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:add', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:17', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000005002', '1000005002', '', '修改用户', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:modify', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000005003', '1000005003', '', '用户授权', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:permission', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000006', '1000006', 'Oplog', '操作日志', NULL, 0, '/system/oplog/index', NULL, '1000', '2', '/oplog', 0, 1, 0, 'system:oplog:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:08:40', '系统管理员', '1', '2021-07-05 01:08:40'); -INSERT INTO `sys_menu` VALUES ('1000007', '1000007', 'SysParameter', '系统参数', NULL, 0, '/system/parameter/index', NULL, '1000', '2', '/parameter', 0, 1, 0, 'system:parameter:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000007001', '1000007001', '', '新增系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000007002', '1000007002', '', '修改系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000007003', '1000007003', '', '删除系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000008', '1000008', 'PublishSysNotice', '发布系统通知', NULL, 0, '/system/notice/publish', NULL, '1000', '2', '/system/notice/publish', 0, 1, 0, 'system:notice:publish', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000008001', '1000008001', '', '新增系统通知', NULL, 0, '', NULL, '1000008', '2', '', 0, 2, 0, 'system:notice:add', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000008002', '1000008002', '', '修改系统通知', NULL, 0, '', NULL, '1000008', '2', '', 0, 2, 0, 'system:notice:modify', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000009', '1000009', 'SysNotice', '系统通知', NULL, 0, '/system/notice/index', NULL, '1000', '2', '/system/notice', 0, 1, 0, 'system:notice:query', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000010', '1000010', 'SysDataDic', '数据字典', NULL, 0, '/system/dic/index', NULL, '1000', '2', '/dic', 0, 1, 0, 'system:dic:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010001', '1000010001', '', '新增数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010002', '1000010002', '', '修改数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010003', '1000010003', '', '删除数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1000010004', '1000010004', '', '新增数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010005', '1000010005', '', '修改数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010006', '1000010006', '', '删除数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010007', '1000010007', '', '新增数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010008', '1000010008', '', '修改数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000010009', '1000010009', '', '删除数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1000011', '1000011', 'SysTenant', '租户管理', NULL, 0, '/system/tenant/index', NULL, '1001', '1', '/system/tenant', 0, 1, 0, 'system:tenant:query', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000011001', '1000011001', '', '新增租户', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:add', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000011002', '1000011002', '', '修改租户', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:modify', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000011003', '1000011003', '', '授权模块', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:module', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); -INSERT INTO `sys_menu` VALUES ('1000012', '1000012', 'OpenDomain', '开放域', NULL, 0, '/system/open-domain/index', NULL, '1001', '14', '/open-domain', 0, 1, 0, 'system:open-domain:config', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('1001', '1001', 'Platform', '平台管理', 'ant-design:global-outlined', NULL, '', NULL, NULL, '1', '/platform', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('1001001', '1001001', 'OnelineCode', '在线开发', NULL, 0, '/iframes/index', NULL, '1001', '1', '/online-code?src=${magic-api.base-url}${magic-api.web}/index.html', 0, 1, 0, 'system:online-code:config', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('2000', '2000', 'BaseData', '基础信息管理', 'ant-design:container-outlined', NULL, '', NULL, NULL, '3', '/base-data', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('2000002', '2000002', 'StoreCenterInfo', '仓库信息', NULL, 0, '/base-data/store-center/index', NULL, '2000', '3', '/store-center', 0, 1, 0, 'base-data:store-center:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000002001', '2000002001', '', '新增仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000002002', '2000002002', '', '修改仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000002003', '2000002003', '', '导入仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000004', '2000004', 'Customer', '客户信息', NULL, 0, '/base-data/customer/index', NULL, '2000', '3', '/customer', 0, 1, 0, 'base-data:customer:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000004001', '2000004001', '', '新增客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000004002', '2000004002', '', '修改客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000004003', '2000004003', '', '导入客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000005', '2000005', 'Supplier', '供应商信息', NULL, 0, '/base-data/supplier/index', NULL, '2000', '3', '/supplier', 0, 1, 0, 'base-data:supplier:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000005001', '2000005001', '', '新增供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000005002', '2000005002', '', '修改供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000005003', '2000005003', '', '导入供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000006', '2000006', 'Member', '会员信息', NULL, 0, '/base-data/member/index', NULL, '2000', '3', '/member', 0, 1, 0, 'base-data:member:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000006001', '2000006001', '', '新增会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000006002', '2000006002', '', '修改会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000006003', '2000006003', '', '导入会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000007', '2000007', 'Shop', '门店信息', NULL, 0, '/base-data/shop/index', NULL, '2000', '3', '/shop', 0, 1, 0, 'base-data:shop:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000007001', '2000007001', '', '新增门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000007002', '2000007002', '', '修改门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000007003', '2000007003', '', '导入门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000008', '2000008', 'PayType', '支付方式', NULL, 0, '/base-data/pay-type/index', NULL, '2000', '3', '/pay-type', 0, 1, 0, 'base-data:pay-type:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000008001', '2000008001', '', '新增支付方式', NULL, 0, '', NULL, '2000008', '3', '', 0, 2, 0, 'base-data:pay-type:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000008002', '2000008002', '', '修改支付方式', NULL, 0, '', NULL, '2000008', '3', '', 0, 2, 0, 'base-data:pay-type:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000009', '2000009', 'Address', '地址库', NULL, 0, '/base-data/address/index', NULL, '2000', '15', '/address', 0, 1, 0, 'base-data:address:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000009001', '2000009001', '', '新增地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000009002', '2000009002', '', '修改地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000009003', '2000009003', '', '导出地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000009004', '2000009004', '', '导入地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000010', '2000010', 'LogisticsCompany', '物流公司', NULL, 0, '/base-data/logistics/company/index', NULL, '2000', '15', '/logistics/company', 0, 1, 0, 'base-data:logistics-company:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2000010001', '2000010001', '', '新增物流公司', NULL, 0, '', NULL, '2000010', '15', '', 0, 2, 0, 'base-data:logistics-company:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2000010002', '2000010002', '', '修改物流公司', NULL, 0, '', NULL, '2000010', '15', '', 0, 2, 0, 'base-data:logistics-company:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001', '2001', 'Product', '商品中心', 'ant-design:appstore-outlined', NULL, '', NULL, NULL, '4', '/product', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('2001001', '2001001', 'ProductCategory', '商品类目', NULL, 0, '/base-data/product/category/index', NULL, '2001', '4', '/category', 0, 1, 0, 'base-data:product:category:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2001001001', '2001001001', '', '新增类目', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001001002', '2001001002', '', '修改类目', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001001003', '2001001003', '', '导入类目', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001002', '2001002', 'ProductBrand', '商品品牌', NULL, 0, '/base-data/product/brand/index', NULL, '2001', '4', '/brand', 0, 1, 0, 'base-data:product:brand:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); -INSERT INTO `sys_menu` VALUES ('2001002001', '2001002001', '', '新增品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001002002', '2001002002', '', '修改品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001002003', '2001002003', '', '导入品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001004', '2001004', 'ProductProperty', '商品属性', NULL, 0, '/base-data/product/property/index', NULL, '2001', '4', '/property', 0, 1, 0, 'base-data:product:property:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); -INSERT INTO `sys_menu` VALUES ('2001004001', '2001004001', '', '新增属性', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001004002', '2001004002', '', '修改属性', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001004003', '2001004003', '', '查询属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:query', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001004004', '2001004004', '', '新增属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001004005', '2001004005', '', '修改属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001005', '2001005', 'ProductInfo', '商品管理', NULL, 0, '/base-data/product/info/index', NULL, '2001', '4', '/info', 0, 1, 0, 'base-data:product:info:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); -INSERT INTO `sys_menu` VALUES ('2001005001', '2001005001', '', '新增商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001005002', '2001005002', '', '修改商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2001005003', '2001005003', '', '导入商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002', '2002', 'Purchase', '采购管理', 'ant-design:money-collect-outlined', NULL, '', NULL, NULL, '5', '/purchase', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('2002001', '2002001', 'PurchaseConfig', '采购参数设置', NULL, 0, '/sc/purchase/config/index', NULL, '2002', '5', '/config', 1, 1, 0, 'purchase:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2002002', '2002002', 'PurchaseOrder', '采购订单管理', NULL, 0, '/sc/purchase/order/index', NULL, '2002', '5', '/order', 0, 1, 0, 'purchase:order:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2002002001', '2002002001', '', '新增采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002002002', '2002002002', '', '修改采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002002003', '2002002003', '', '删除采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002002004', '2002002004', '', '审核采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002002005', '2002002005', '', '导出采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002002006', '2002002006', '', '导入采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:import', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003', '2002003', 'ReceiveSheet', '采购收货管理', NULL, 0, '/sc/purchase/receive/index', NULL, '2002', '5', '/receive', 0, 1, 0, 'purchase:receive:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2002003001', '2002003001', '', '新增采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003002', '2002003002', '', '修改采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003003', '2002003003', '', '删除采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003004', '2002003004', '', '审核采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003005', '2002003005', '', '导出采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002003006', '2002003006', '', '导入采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:import', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002004', '2002004', 'PurchaseReturn', '采购退货管理', NULL, 0, '/sc/purchase/return/index', NULL, '2002', '5', '/return', 0, 1, 0, 'purchase:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2002004001', '2002004001', '', '新增采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002004002', '2002004002', '', '修改采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002004003', '2002004003', '', '删除采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002004004', '2002004004', '', '审核采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2002004005', '2002004005', '', '导出采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003', '2003', 'Sale', '销售管理', 'ant-design:rocket-outlined', NULL, '', NULL, NULL, '6', '/sale', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('2003001', '2003001', 'SaleConfig', '销售参数设置', NULL, 0, '/sc/sale/config/index', NULL, '2003', '6', '/config', 1, 1, 0, 'sale:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2003002', '2003002', 'SaleOrder', '销售订单管理', NULL, 0, '/sc/sale/order/index', NULL, '2003', '6', '/order', 0, 1, 0, 'sale:order:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2003002001', '2003002001', '', '新增销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003002002', '2003002002', '', '修改销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003002003', '2003002003', '', '删除销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003002004', '2003002004', '', '审核销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003002005', '2003002005', '', '导出销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003003', '2003003', 'SaleOutSheet', '销售出库管理', NULL, 0, '/sc/sale/out/index', NULL, '2003', '6', '/out', 0, 1, 0, 'sale:out:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2003003001', '2003003001', '', '新增销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003003002', '2003003002', '', '修改销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003003003', '2003003003', '', '删除销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003003004', '2003003004', '', '审核销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003003005', '2003003005', '', '导出销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003004', '2003004', 'SaleReturn', '销售退货管理', NULL, 0, '/sc/sale/return/index', NULL, '2003', '6', '/return', 0, 1, 0, 'sale:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2003004001', '2003004001', '', '新增销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003004002', '2003004002', '', '修改销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003004003', '2003004003', '', '删除销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003004004', '2003004004', '', '审核销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2003004005', '2003004005', '', '导出销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004', '2004', 'Retail', '零售管理', 'ant-design:flag-outlined', NULL, '', NULL, NULL, '7', '/retail', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('2004001', '2004001', 'RetailConfig', '零售参数设置', NULL, 0, '/sc/retail/config/index', NULL, '2004', '7', '/config', 1, 1, 0, 'retail:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2004002', '2004002', 'RetailOutSheet', '零售出库管理', NULL, 0, '/sc/retail/out/index', NULL, '2004', '7', '/out', 0, 1, 0, 'retail:out:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2004002001', '2004002001', '', '新增零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004002002', '2004002002', '', '修改零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004002003', '2004002003', '', '删除零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004002004', '2004002004', '', '审核零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004002005', '2004002005', '', '导出零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004003', '2004003', 'RetailReturn', '零售退货管理', NULL, 0, '/sc/retail/return/index', NULL, '2004', '7', '/return', 0, 1, 0, 'retail:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('2004003001', '2004003001', '', '新增零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004003002', '2004003002', '', '修改零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004003003', '2004003003', '', '删除零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004003004', '2004003004', '', '审核零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('2004003005', '2004003005', '', '导出零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000', '3000', 'StockManage', '库存管理', 'ant-design:hdd-outlined', NULL, '', NULL, NULL, '8', '/stock', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('3000001', '3000001', 'ProductStock', '商品库存', NULL, 0, '/sc/stock/product/index', NULL, '3000', '8', '/product', 0, 1, 0, 'stock:product:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000001001', '3000001001', '', '导出商品库存', NULL, 0, '', NULL, '3000001', '8', '', 0, 2, 0, 'stock:product:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000003', '3000003', 'ProductStockLog', '商品库存变动记录', NULL, 0, '/sc/stock/product-log/index', NULL, '3000', '8', '/product/log', 0, 1, 0, 'stock:product-log:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000003001', '3000003001', '', '导出商品库存变动记录', NULL, 0, '', NULL, '3000003', '8', '', 0, 2, 0, 'stock:product-log:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004', '3000004', 'TakeStock', '库存盘点', 'ant-design:monitor-outlined', NULL, '', NULL, NULL, '9', '/take', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('3000004001', '3000004001', 'TakeStockConfig', '盘点参数设置', NULL, 0, '/sc/stock/take/config/index', NULL, '3000004', '9', '/config', 1, 1, 0, 'stock:take:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000004002', '3000004002', 'PreTakeStockSheet', '预先盘点单管理', NULL, 0, '/sc/stock/take/pre/index', NULL, '3000004', '9', '/pre', 0, 1, 0, 'stock:take:pre:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000004002001', '3000004002001', '', '新增预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004002002', '3000004002002', '', '修改预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004002003', '3000004002003', '', '删除预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004002004', '3000004002004', '', '导出预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003', '3000004003', 'TakeStockPlan', '盘点任务管理', NULL, 0, '/sc/stock/take/plan/index', NULL, '3000004', '9', '/plan', 0, 1, 0, 'stock:take:plan:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000004003001', '3000004003001', '', '新增盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003002', '3000004003002', '', '修改盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003003', '3000004003003', '', '删除盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003004', '3000004003004', '', '导出盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003005', '3000004003005', '', '差异生成', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:create-diff', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003006', '3000004003006', '', '差异处理', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:handle-diff', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004003007', '3000004003007', '', '作废盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:cancel', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004', '3000004004', 'TakeStockSheet', '盘点单管理', NULL, 0, '/sc/stock/take/sheet/index', NULL, '3000004', '9', '/sheet', 0, 1, 0, 'stock:take:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000004004001', '3000004004001', '', '新增盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004002', '3000004004002', '', '修改盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004003', '3000004004003', '', '删除盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004004', '3000004004004', '', '导出盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004005', '3000004004005', '', '审核盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000004004006', '3000004004006', '', '取消审核盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:cancel-approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005', '3000005', 'StockAdjust', '库存调整', 'ant-design:thunderbolt-outlined', NULL, '', NULL, NULL, '10', '/take-adjust', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('3000005001', '3000005001', 'StockCostAdjustSheet', '库存成本调整', NULL, 0, '/sc/stock/adjust/cost/index', NULL, '3000005', '10', '/cost', 0, 1, 0, 'stock:adjust:cost:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000005001001', '3000005001001', '', '新增库存成本调整单', NULL, 0, '', NULL, '3000005001', '10', '', 0, 2, 0, 'stock:adjust:cost:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005001002', '3000005001002', '', '修改库存成本调整单', NULL, 0, '', NULL, '3000005001', '10', '', 0, 2, 0, 'stock:adjust:cost:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005001003', '3000005001003', '', '删除库存成本调整单', NULL, 0, '', NULL, '3000005001', '10', '', 0, 2, 0, 'stock:adjust:cost:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005001004', '3000005001004', '', '导出库存成本调整单', NULL, 0, '', NULL, '3000005001', '10', '', 0, 2, 0, 'stock:adjust:cost:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005001005', '3000005001005', '', '审核库存成本调整单', NULL, 0, '', NULL, '3000005001', '10', '', 0, 2, 0, 'stock:adjust:cost:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005002', '3000005002', 'StockAdjustReason', '库存调整原因', NULL, 0, '/sc/stock/adjust/stock/reason/index', NULL, '3000005', '10', '/stock/reason', 0, 1, 0, 'stock:adjust:reason:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000005002001', '3000005002001', '', '新增库存成本调整单', NULL, 0, '', NULL, '3000005002', '10', '', 0, 2, 0, 'stock:adjust:reason:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005002002', '3000005002002', '', '修改库存成本调整单', NULL, 0, '', NULL, '3000005002', '10', '', 0, 2, 0, 'stock:adjust:reason:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005003', '3000005003', 'StockAdjustSheet', '库存数量调整', NULL, 0, '/sc/stock/adjust/stock/index', NULL, '3000005', '10', '/stock', 0, 1, 0, 'stock:adjust:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000005003001', '3000005003001', '', '新增库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005003002', '3000005003002', '', '修改库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005003003', '3000005003003', '', '删除库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005003004', '3000005003004', '', '导出库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000005003005', '3000005003005', '', '审核库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006', '3000006', 'ScTransferOrder', '仓库调拨', NULL, 0, '/sc/stock/transfer/index', NULL, '3000', '8', '/transfer', 0, 1, 0, 'stock:sc-transfer:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('3000006001', '3000006001', '', '新增仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006002', '3000006002', '', '修改仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006003', '3000006003', '', '删除仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006004', '3000006004', '', '导出仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006005', '3000006005', '', '审核仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('3000006006', '3000006006', '', '仓库调拨单收货', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:receive', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000', '4000', 'SettleManage', '结算管理', 'ant-design:credit-card-outlined', NULL, '', NULL, NULL, '11', '/settle', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('4000001', '4000001', 'SettleInItem', '收入项目', NULL, 0, '/settle/in-item/index', NULL, '4000', '11', '/in-item', 0, 1, 0, 'settle:in-item:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000001001', '4000001001', '', '新增收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000001002', '4000001002', '', '修改收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000001003', '4000001003', '', '导出收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000002', '4000002', 'SettleOutItem', '支出项目', NULL, 0, '/settle/out-item/index', NULL, '4000', '11', '/out-item', 0, 1, 0, 'settle:out-item:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000002001', '4000002001', '', '新增支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000002002', '4000002002', '', '修改支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000002003', '4000002003', '', '导出支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000003', '4000003', 'SettleFeeSheet', '供应商费用', NULL, 0, '/settle/fee-sheet/index', NULL, '4000007', '11', '/fee-sheet', 0, 1, 0, 'settle:fee-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000003001', '4000003001', '', '新增供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000003002', '4000003002', '', '修改供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000003003', '4000003003', '', '删除供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000003004', '4000003004', '', '审核供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000003005', '4000003005', '', '导出供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000004', '4000004', 'SettlePreSheet', '供应商预付款', NULL, 0, '/settle/pre-sheet/index', NULL, '4000007', '11', '/pre-sheet', 0, 1, 0, 'settle:pre-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000004001', '4000004001', '', '新增供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000004002', '4000004002', '', '修改供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000004003', '4000004003', '', '删除供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000004004', '4000004004', '', '审核供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000004005', '4000004005', '', '导出供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000005', '4000005', 'SettleCheckSheet', '供应商对账', NULL, 0, '/settle/check-sheet/index', NULL, '4000007', '11', '/check-sheet', 0, 1, 0, 'settle:check-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000005001', '4000005001', '', '新增供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000005002', '4000005002', '', '修改供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000005003', '4000005003', '', '删除供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000005004', '4000005004', '', '审核供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000005005', '4000005005', '', '导出供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000006', '4000006', 'SettleSheet', '供应商结算', NULL, 0, '/settle/sheet/index', NULL, '4000007', '11', '/sheet', 0, 1, 0, 'settle:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000006001', '4000006001', '', '新增供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000006002', '4000006002', '', '修改供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000006003', '4000006003', '', '删除供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000006004', '4000006004', '', '审核供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000006005', '4000006005', '', '导出供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000007', '4000007', 'SupplierSettleManage', '供应商结算', NULL, NULL, '', NULL, '4000', '11', '/supplier', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('4000008', '4000008', 'CustomerSettleManage', '客户结算', NULL, NULL, '', NULL, '4000', '11', '/customer', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); -INSERT INTO `sys_menu` VALUES ('4000009', '4000009', 'CustomerSettleFeeSheet', '客户费用', NULL, 0, '/customer-settle/fee-sheet/index', NULL, '4000008', '11', '/fee-sheet', 0, 1, 0, 'customer-settle:fee-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000009001', '4000009001', '', '新增客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000009002', '4000009002', '', '修改客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000009003', '4000009003', '', '删除客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000009004', '4000009004', '', '审核客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000009005', '4000009005', '', '导出客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000010', '4000010', 'CustomerSettlePreSheet', '客户预收款', NULL, 0, '/customer-settle/pre-sheet/index', NULL, '4000008', '11', '/pre-sheet', 0, 1, 0, 'customer-settle:pre-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000010001', '4000010001', '', '新增客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000010002', '4000010002', '', '修改客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000010003', '4000010003', '', '删除客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000010004', '4000010004', '', '审核客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000010005', '4000010005', '', '导出客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000011', '4000011', 'CustomerSettleCheckSheet', '客户对账', NULL, 0, '/customer-settle/check-sheet/index', NULL, '4000008', '11', '/check-sheet', 0, 1, 0, 'customer-settle:check-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000011001', '4000011001', '', '新增客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000011002', '4000011002', '', '修改客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000011003', '4000011003', '', '删除客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000011004', '4000011004', '', '审核客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000011005', '4000011005', '', '导出客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000012', '4000012', 'CustomerSettleSheet', '客户结算', NULL, 0, '/customer-settle/sheet/index', NULL, '4000008', '11', '/sheet', 0, 1, 0, 'customer-settle:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); -INSERT INTO `sys_menu` VALUES ('4000012001', '4000012001', '', '新增客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000012002', '4000012002', '', '修改客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000012003', '4000012003', '', '删除客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000012004', '4000012004', '', '审核客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('4000012005', '4000012005', '', '导出客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('5000', '5000', 'Logistics', '物流管理', 'ant-design:gift-outlined', NULL, '', NULL, NULL, '15', '/logistics', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('5000001', '5000001', 'LogisticsSheet', '物流单管理', NULL, 0, '/sc/logistics/sheet/index', NULL, '5000', '15', '/sheet', 0, 1, 0, 'logistics:sheet:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('5000001001', '5000001001', '', '新增物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('5000001002', '5000001002', '', '修改物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('5000001003', '5000001003', '', '删除物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('5000001004', '5000001004', '', '物流单发货', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:delivery', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('5000001005', '5000001005', '', '导入物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('5000001006', '5000001006', '', '导出物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('9000', '9000', 'Development', '开发管理', 'ant-design:tool-outlined', NULL, '', NULL, NULL, '12', '/development', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('9000001', '9000001', 'Qrtz', '定时器管理', NULL, 0, '/development/qrtz/index', NULL, '9000', '12', '/qrtz', 0, 1, 0, 'development:qrtz:manage', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9000002', '9000002', 'DataEntity', '数据实体', NULL, 0, '/development/data/entity/index', NULL, '9000', '12', '/data/entity', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9000003', '9000003', 'DataObj', '数据对象', NULL, 0, '/development/data/obj/index', NULL, '9000', '12', '/data/obj', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9000004', '9000004', 'CustomList', '自定义列表', NULL, 0, '/development/custom/list/index', NULL, '9000', '12', '/custom/list', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9000005', '9000005', 'CustomSelector', '自定义选择器', NULL, 0, '/development/custom/selector/index', NULL, '9000', '12', '/custom/selector', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9000008', '9000008', 'CustomPage', '自定义页面', NULL, 0, '/development/custom/page/index', NULL, '9000', '12', '/custom/page', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); -INSERT INTO `sys_menu` VALUES ('9001', '9001', 'SmartWork', '便捷办公', 'ant-design:read-outlined', NULL, '', NULL, NULL, '13', '/smart-work', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); -INSERT INTO `sys_menu` VALUES ('9001001', '9001001', 'FileBox', '文件收纳箱', NULL, 0, '/smart-work/file-box/index', NULL, '9001', '13', '/file-box', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +BEGIN; +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000', '1000', 'System', '系统管理', 'ant-design:setting-outlined', NULL, '', NULL, NULL, '2', '/system', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2023-10-27 17:01:09'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000001', '1000001', 'Menu', '菜单管理', NULL, 0, '/system/menu/index', NULL, '1000', '2', '/menu', 0, 1, 0, 'system:menu:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2023-10-27 17:01:09'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000001001', '1000001001', '', '新增菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2023-10-27 17:01:09'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000001002', '1000001002', '', '修改菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000001003', '1000001003', '', '删除菜单', NULL, 0, '', NULL, '1000001', '2', '', 0, 2, 0, 'system:menu:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000002', '1000002', 'Dept', '部门管理', NULL, 0, '/system/dept/index', NULL, '1000', '2', '/dept', 0, 1, 0, 'system:dept:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:09:27', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000002001', '1000002001', '', '新增部门', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:add', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:31', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000002002', '1000002002', '', '修改部门', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:modify', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:47', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000002003', '1000002003', '', '部门权限', NULL, 0, '', NULL, '1000002', '2', '', 0, 2, 0, 'system:dept:permission', 1, 1, '', '系统管理员', '1', '2021-06-27 01:33:47', '系统管理员', '1', '2023-10-27 17:00:27'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000004', '1000004', 'Role', '角色管理', NULL, 0, '/system/role/index', NULL, '1000', '2', '/role', 0, 1, 0, 'system:role:query', 1, 1, '', '系统管理员', '1', '2021-07-04 00:35:49', '系统管理员', '1', '2021-07-04 00:35:49'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000004001', '1000004001', '', '新增角色', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:add', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:17', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000004002', '1000004002', '', '修改角色', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:modify', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000004003', '1000004003', '', '角色授权', NULL, 0, '', NULL, '1000004', '2', '', 0, 2, 0, 'system:role:permission', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000005', '1000005', 'User', '用户管理', NULL, 0, '/system/user/index', NULL, '1000', '2', '/user', 0, 1, 0, 'system:user:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:08:40', '系统管理员', '1', '2021-07-05 01:08:40'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000005001', '1000005001', '', '新增用户', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:add', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:17', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000005002', '1000005002', '', '修改用户', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:modify', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000005003', '1000005003', '', '用户授权', NULL, 0, '', NULL, '1000005', '2', '', 0, 2, 0, 'system:user:permission', 1, 1, '', '系统管理员', '1', '2021-06-30 00:32:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000006', '1000006', 'Oplog', '操作日志', NULL, 0, '/system/oplog/index', NULL, '1000', '2', '/oplog', 0, 1, 0, 'system:oplog:query', 1, 1, '', '系统管理员', '1', '2021-07-05 01:08:40', '系统管理员', '1', '2021-07-05 01:08:40'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000007', '1000007', 'SysParameter', '系统参数', NULL, 0, '/system/parameter/index', NULL, '1000', '2', '/parameter', 0, 1, 0, 'system:parameter:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000007001', '1000007001', '', '新增系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000007002', '1000007002', '', '修改系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000007003', '1000007003', '', '删除系统参数', NULL, 0, '', NULL, '1000007', '2', '', 0, 2, 0, 'system:parameter:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000008', '1000008', 'PublishSysNotice', '发布系统通知', NULL, 0, '/system/notice/publish', NULL, '1002', '2', '/system/notice/publish', 0, 1, 0, 'system:notice:publish', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000008001', '1000008001', '', '新增系统通知', NULL, 0, '', NULL, '1000008', '2', '', 0, 2, 0, 'system:notice:add', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000008002', '1000008002', '', '修改系统通知', NULL, 0, '', NULL, '1000008', '2', '', 0, 2, 0, 'system:notice:modify', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000009', '1002001', 'MySysNotice', '我的系统通知', NULL, 0, '/system/notice/index', NULL, '1002', '2', '/system/notice/my', 0, 1, 0, '', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010', '1000010', 'SysDataDic', '数据字典', NULL, 0, '/system/dic/index', NULL, '1000', '2', '/dic', 0, 1, 0, 'system:dic:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010001', '1000010001', '', '新增数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010002', '1000010002', '', '修改数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010003', '1000010003', '', '删除数据字典', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010004', '1000010004', '', '新增数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010005', '1000010005', '', '修改数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010006', '1000010006', '', '删除数据字典分类', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-category:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010007', '1000010007', '', '新增数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010008', '1000010008', '', '修改数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000010009', '1000010009', '', '删除数据字典值', NULL, 0, '', NULL, '1000010', '2', '', 0, 2, 0, 'system:dic-item:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000011', '1000011', 'SysTenant', '租户管理', NULL, 0, '/system/tenant/index', NULL, '1001', '1', '/system/tenant', 0, 1, 0, 'system:tenant:query', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000011001', '1000011001', '', '新增租户', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:add', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000011002', '1000011002', '', '修改租户', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:modify', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000011003', '1000011003', '', '授权模块', NULL, 0, '', NULL, '1000011', '1', '', 0, 2, 0, 'system:tenant:module', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000012', '1000012', 'OpenDomain', '开放域', NULL, 0, '/system/open-domain/index', NULL, '1001', '14', '/open-domain', 0, 1, 0, 'system:open-domain:config', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000013', '1000013', 'SysGenerateCode', '编号规则', NULL, 0, '/system/generate-code/index', NULL, '1000', '2', '/generate-code', 0, 1, 0, 'system:generate-code:manage', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014', '1000014', 'SysNotifyGroup', '消息通知组', NULL, 0, '/system/notify-group/index', NULL, '1000', '2', '/notify-group', 0, 1, 0, 'system:notify-group:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014001', '1000014001', '', '新增消息通知组', NULL, 0, '', NULL, '1000014', '8', '', 0, 2, 0, 'system:notify-group:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014002', '1000014002', '', '修改消息通知组', NULL, 0, '', NULL, '1000014', '8', '', 0, 2, 0, 'system:notify-group:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1001', '1001', 'Platform', '平台管理', 'ant-design:global-outlined', NULL, '', NULL, NULL, '1', '/platform', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1001001', '1001001', 'OnelineCode', '在线开发', NULL, 0, '/iframes/index', NULL, '1001', '1', '/online-code?src=${magic-api.base-url}${magic-api.web}/index.html', 0, 1, 0, 'system:online-code:config', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002', '1002', 'MsgCenter', '消息中心', 'ant-design:message-outlined', NULL, '', NULL, NULL, '2', '/msg-center', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002001', '1002001', 'SiteMessage', '站内信', NULL, 0, '/system/site-message/manage', NULL, '1002', '2', '/system/site-message/manage', 0, 1, 0, 'system:site-message:manage', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002002', '1002002', 'MySiteMessage', '我的站内信', NULL, 0, '/system/site-message/index', NULL, '1002', '2', '/system/site-message/my', 0, 1, 0, '', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002003', '1002003', 'MailMessage', '邮件消息', NULL, 0, '/system/mail-message/index', NULL, '1002', '2', '/system/mail-message', 0, 1, 0, 'system:mail-message:manage', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000', '2000', 'BaseData', '基础信息管理', 'ant-design:container-outlined', NULL, '', NULL, NULL, '3', '/base-data', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000002', '2000002', 'StoreCenterInfo', '仓库信息', NULL, 0, '/base-data/store-center/index', NULL, '2000', '3', '/store-center', 0, 1, 0, 'base-data:store-center:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000002001', '2000002001', '', '新增仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000002002', '2000002002', '', '修改仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000002003', '2000002003', '', '导入仓库', NULL, 0, '', NULL, '2000002', '3', '', 0, 2, 0, 'base-data:store-center:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000004', '2000004', 'Customer', '客户信息', NULL, 0, '/base-data/customer/index', NULL, '2000', '3', '/customer', 0, 1, 0, 'base-data:customer:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000004001', '2000004001', '', '新增客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000004002', '2000004002', '', '修改客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000004003', '2000004003', '', '导入客户', NULL, 0, '', NULL, '2000004', '3', '', 0, 2, 0, 'base-data:customer:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000005', '2000005', 'Supplier', '供应商信息', NULL, 0, '/base-data/supplier/index', NULL, '2000', '3', '/supplier', 0, 1, 0, 'base-data:supplier:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000005001', '2000005001', '', '新增供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000005002', '2000005002', '', '修改供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000005003', '2000005003', '', '导入供应商', NULL, 0, '', NULL, '2000005', '3', '', 0, 2, 0, 'base-data:supplier:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000006', '2000006', 'Member', '会员信息', NULL, 0, '/base-data/member/index', NULL, '2000', '3', '/member', 0, 1, 0, 'base-data:member:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000006001', '2000006001', '', '新增会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000006002', '2000006002', '', '修改会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000006003', '2000006003', '', '导入会员', NULL, 0, '', NULL, '2000006', '3', '', 0, 2, 0, 'base-data:member:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000007', '2000007', 'Shop', '门店信息', NULL, 0, '/base-data/shop/index', NULL, '2000', '3', '/shop', 0, 1, 0, 'base-data:shop:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000007001', '2000007001', '', '新增门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000007002', '2000007002', '', '修改门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000007003', '2000007003', '', '导入门店', NULL, 0, '', NULL, '2000007', '3', '', 0, 2, 0, 'base-data:shop:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000008', '2000008', 'PayType', '支付方式', NULL, 0, '/base-data/pay-type/index', NULL, '2000', '3', '/pay-type', 0, 1, 0, 'base-data:pay-type:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000008001', '2000008001', '', '新增支付方式', NULL, 0, '', NULL, '2000008', '3', '', 0, 2, 0, 'base-data:pay-type:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000008002', '2000008002', '', '修改支付方式', NULL, 0, '', NULL, '2000008', '3', '', 0, 2, 0, 'base-data:pay-type:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000009', '2000009', 'Address', '地址库', NULL, 0, '/base-data/address/index', NULL, '2000', '15', '/address', 0, 1, 0, 'base-data:address:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000009001', '2000009001', '', '新增地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000009002', '2000009002', '', '修改地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000009003', '2000009003', '', '导出地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000009004', '2000009004', '', '导入地址', NULL, 0, '', NULL, '2000009', '15', '', 0, 2, 0, 'base-data:address:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000010', '2000010', 'LogisticsCompany', '物流公司', NULL, 0, '/base-data/logistics/company/index', NULL, '2000', '15', '/logistics/company', 0, 1, 0, 'base-data:logistics-company:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000010001', '2000010001', '', '新增物流公司', NULL, 0, '', NULL, '2000010', '15', '', 0, 2, 0, 'base-data:logistics-company:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2000010002', '2000010002', '', '修改物流公司', NULL, 0, '', NULL, '2000010', '15', '', 0, 2, 0, 'base-data:logistics-company:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001', '2001', 'Product', '商品中心', 'ant-design:appstore-outlined', NULL, '', NULL, NULL, '4', '/product', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001001', '2001001', 'ProductCategory', '商品分类', NULL, 0, '/base-data/product/category/index', NULL, '2001', '4', '/category', 0, 1, 0, 'base-data:product:category:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001001001', '2001001001', '', '新增分类', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001001002', '2001001002', '', '修改分类', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001001003', '2001001003', '', '导入分类', NULL, 0, '', NULL, '2001001', '4', '', 0, 2, 0, 'base-data:product:category:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001002', '2001002', 'ProductBrand', '商品品牌', NULL, 0, '/base-data/product/brand/index', NULL, '2001', '4', '/brand', 0, 1, 0, 'base-data:product:brand:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001002001', '2001002001', '', '新增品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001002002', '2001002002', '', '修改品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001002003', '2001002003', '', '导入品牌', NULL, 0, '', NULL, '2001002', '4', '', 0, 2, 0, 'base-data:product:brand:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004', '2001004', 'ProductProperty', '商品属性', NULL, 0, '/base-data/product/property/index', NULL, '2001', '4', '/property', 0, 1, 0, 'base-data:product:property:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004001', '2001004001', '', '新增属性', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004002', '2001004002', '', '修改属性', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004003', '2001004003', '', '查询属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:query', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004004', '2001004004', '', '新增属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001004005', '2001004005', '', '修改属性值', NULL, 0, '', NULL, '2001004', '4', '', 0, 2, 0, 'base-data:product:property-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001005', '2001005', 'ProductInfo', '商品管理', NULL, 0, '/base-data/product/info/index', NULL, '2001', '4', '/info', 0, 1, 0, 'base-data:product:info:query', 1, 1, '', '系统管理员', '1', '2021-07-06 17:01:00', '系统管理员', '1', '2021-07-06 17:01:00'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001005001', '2001005001', '', '新增商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001005002', '2001005002', '', '修改商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2001005003', '2001005003', '', '导入商品', NULL, 0, '', NULL, '2001005', '4', '', 0, 2, 0, 'base-data:product:info:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002', '2002', 'Purchase', '采购管理', 'ant-design:money-collect-outlined', NULL, '', NULL, NULL, '5', '/purchase', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002001', '2002001', 'PurchaseConfig', '采购参数设置', NULL, 0, '/sc/purchase/config/index', NULL, '2002', '5', '/config', 1, 1, 0, 'purchase:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002', '2002002', 'PurchaseOrder', '采购订单管理', NULL, 0, '/sc/purchase/order/index', NULL, '2002', '5', '/order', 0, 1, 0, 'purchase:order:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002001', '2002002001', '', '新增采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002002', '2002002002', '', '修改采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002003', '2002002003', '', '删除采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002004', '2002002004', '', '审核采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002005', '2002002005', '', '导出采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002002006', '2002002006', '', '导入采购订单', NULL, 0, '', NULL, '2002002', '5', '', 0, 2, 0, 'purchase:order:import', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003', '2002003', 'ReceiveSheet', '采购收货管理', NULL, 0, '/sc/purchase/receive/index', NULL, '2002', '5', '/receive', 0, 1, 0, 'purchase:receive:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003001', '2002003001', '', '新增采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003002', '2002003002', '', '修改采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003003', '2002003003', '', '删除采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003004', '2002003004', '', '审核采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003005', '2002003005', '', '导出采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002003006', '2002003006', '', '导入采购收货单', NULL, 0, '', NULL, '2002003', '5', '', 0, 2, 0, 'purchase:receive:import', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004', '2002004', 'PurchaseReturn', '采购退货管理', NULL, 0, '/sc/purchase/return/index', NULL, '2002', '5', '/return', 0, 1, 0, 'purchase:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004001', '2002004001', '', '新增采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004002', '2002004002', '', '修改采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004003', '2002004003', '', '删除采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004004', '2002004004', '', '审核采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2002004005', '2002004005', '', '导出采购退货单', NULL, 0, '', NULL, '2002004', '5', '', 0, 2, 0, 'purchase:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003', '2003', 'Sale', '销售管理', 'ant-design:rocket-outlined', NULL, '', NULL, NULL, '6', '/sale', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003001', '2003001', 'SaleConfig', '销售参数设置', NULL, 0, '/sc/sale/config/index', NULL, '2003', '6', '/config', 1, 1, 0, 'sale:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002', '2003002', 'SaleOrder', '销售订单管理', NULL, 0, '/sc/sale/order/index', NULL, '2003', '6', '/order', 0, 1, 0, 'sale:order:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002001', '2003002001', '', '新增销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002002', '2003002002', '', '修改销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002003', '2003002003', '', '删除销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002004', '2003002004', '', '审核销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003002005', '2003002005', '', '导出销售订单', NULL, 0, '', NULL, '2003002', '6', '', 0, 2, 0, 'sale:order:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003', '2003003', 'SaleOutSheet', '销售出库管理', NULL, 0, '/sc/sale/out/index', NULL, '2003', '6', '/out', 0, 1, 0, 'sale:out:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003001', '2003003001', '', '新增销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003002', '2003003002', '', '修改销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003003', '2003003003', '', '删除销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003004', '2003003004', '', '审核销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003003005', '2003003005', '', '导出销售出库单', NULL, 0, '', NULL, '2003003', '6', '', 0, 2, 0, 'sale:out:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004', '2003004', 'SaleReturn', '销售退货管理', NULL, 0, '/sc/sale/return/index', NULL, '2003', '6', '/return', 0, 1, 0, 'sale:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004001', '2003004001', '', '新增销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004002', '2003004002', '', '修改销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004003', '2003004003', '', '删除销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004004', '2003004004', '', '审核销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2003004005', '2003004005', '', '导出销售退货单', NULL, 0, '', NULL, '2003004', '6', '', 0, 2, 0, 'sale:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004', '2004', 'Retail', '零售管理', 'ant-design:flag-outlined', NULL, '', NULL, NULL, '7', '/retail', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004001', '2004001', 'RetailConfig', '零售参数设置', NULL, 0, '/sc/retail/config/index', NULL, '2004', '7', '/config', 1, 1, 0, 'retail:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002', '2004002', 'RetailOutSheet', '零售出库管理', NULL, 0, '/sc/retail/out/index', NULL, '2004', '7', '/out', 0, 1, 0, 'retail:out:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002001', '2004002001', '', '新增零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002002', '2004002002', '', '修改零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002003', '2004002003', '', '删除零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002004', '2004002004', '', '审核零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004002005', '2004002005', '', '导出零售出库单', NULL, 0, '', NULL, '2004002', '7', '', 0, 2, 0, 'retail:out:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003', '2004003', 'RetailReturn', '零售退货管理', NULL, 0, '/sc/retail/return/index', NULL, '2004', '7', '/return', 0, 1, 0, 'retail:return:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003001', '2004003001', '', '新增零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003002', '2004003002', '', '修改零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003003', '2004003003', '', '删除零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003004', '2004003004', '', '审核零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2004003005', '2004003005', '', '导出零售退货单', NULL, 0, '', NULL, '2004003', '7', '', 0, 2, 0, 'retail:return:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000', '3000', 'StockManage', '库存管理', 'ant-design:hdd-outlined', NULL, '', NULL, NULL, '8', '/stock', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000001', '3000001', 'ProductStock', '商品库存', NULL, 0, '/sc/stock/product/index', NULL, '3000', '8', '/product', 0, 1, 0, 'stock:product:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000001001', '3000001001', '', '导出商品库存', NULL, 0, '', NULL, '3000001', '8', '', 0, 2, 0, 'stock:product:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000003', '3000003', 'ProductStockLog', '商品库存变动记录', NULL, 0, '/sc/stock/product-log/index', NULL, '3000', '8', '/product/log', 0, 1, 0, 'stock:product-log:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000003001', '3000003001', '', '导出商品库存变动记录', NULL, 0, '', NULL, '3000003', '8', '', 0, 2, 0, 'stock:product-log:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004', '3000004', 'TakeStock', '库存盘点', 'ant-design:monitor-outlined', NULL, '', NULL, NULL, '9', '/take', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004001', '3000004001', 'TakeStockConfig', '盘点参数设置', NULL, 0, '/sc/stock/take/config/index', NULL, '3000004', '9', '/config', 1, 1, 0, 'stock:take:config:modify', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004002', '3000004002', 'PreTakeStockSheet', '预先盘点单管理', NULL, 0, '/sc/stock/take/pre/index', NULL, '3000004', '9', '/pre', 0, 1, 0, 'stock:take:pre:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004002001', '3000004002001', '', '新增预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004002002', '3000004002002', '', '修改预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004002003', '3000004002003', '', '删除预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004002004', '3000004002004', '', '导出预先盘点单', NULL, 0, '', NULL, '3000004002', '9', '', 0, 2, 0, 'stock:take:pre:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003', '3000004003', 'TakeStockPlan', '盘点任务管理', NULL, 0, '/sc/stock/take/plan/index', NULL, '3000004', '9', '/plan', 0, 1, 0, 'stock:take:plan:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003001', '3000004003001', '', '新增盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003002', '3000004003002', '', '修改盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003003', '3000004003003', '', '删除盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003004', '3000004003004', '', '导出盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003005', '3000004003005', '', '差异生成', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:create-diff', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003006', '3000004003006', '', '差异处理', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:handle-diff', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004003007', '3000004003007', '', '作废盘点任务', NULL, 0, '', NULL, '3000004003', '9', '', 0, 2, 0, 'stock:take:plan:cancel', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004', '3000004004', 'TakeStockSheet', '盘点单管理', NULL, 0, '/sc/stock/take/sheet/index', NULL, '3000004', '9', '/sheet', 0, 1, 0, 'stock:take:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004001', '3000004004001', '', '新增盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004002', '3000004004002', '', '修改盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004003', '3000004004003', '', '删除盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004004', '3000004004004', '', '导出盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004005', '3000004004005', '', '审核盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000004004006', '3000004004006', '', '取消审核盘点单', NULL, 0, '', NULL, '3000004004', '9', '', 0, 2, 0, 'stock:take:sheet:cancel-approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005', '3000005', 'StockAdjust', '库存调整', 'ant-design:thunderbolt-outlined', NULL, '', NULL, NULL, '10', '/take-adjust', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005002', '3000005002', 'StockAdjustReason', '库存调整原因', NULL, 0, '/sc/stock/adjust/stock/reason/index', NULL, '3000005', '10', '/stock/reason', 0, 1, 0, 'stock:adjust:reason:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005002001', '3000005002001', '', '新增库存调整原因', NULL, 0, '', NULL, '3000005002', '10', '', 0, 2, 0, 'stock:adjust:reason:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005002002', '3000005002002', '', '修改库存调整原因', NULL, 0, '', NULL, '3000005002', '10', '', 0, 2, 0, 'stock:adjust:reason:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003', '3000005003', 'StockAdjustSheet', '库存调整', NULL, 0, '/sc/stock/adjust/stock/index', NULL, '3000005', '10', '/stock', 0, 1, 0, 'stock:adjust:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003001', '3000005003001', '', '新增库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003002', '3000005003002', '', '修改库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003003', '3000005003003', '', '删除库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003004', '3000005003004', '', '导出库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000005003005', '3000005003005', '', '审核库存调整单', NULL, 0, '', NULL, '3000005003', '10', '', 0, 2, 0, 'stock:adjust:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006', '3000006', 'ScTransferOrder', '仓库调拨', NULL, 0, '/sc/stock/transfer/index', NULL, '3000', '8', '/transfer', 0, 1, 0, 'stock:sc-transfer:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006001', '3000006001', '', '新增仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006002', '3000006002', '', '修改仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006003', '3000006003', '', '删除仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006004', '3000006004', '', '导出仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:export', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006005', '3000006005', '', '审核仓库调拨单', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000006006', '3000006006', '', '仓库调拨单收货', NULL, 0, '', NULL, '3000006', '8', '', 0, 2, 0, 'stock:sc-transfer:receive', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007', '3000007', 'StockWarning', '库存预警', NULL, 0, '/sc/stock/warning/index', NULL, '3000', '8', '/warning', 0, 1, 0, 'stock:warning:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007001', '3000007001', '', '新增库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007002', '3000007002', '', '修改库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007003', '3000007003', '', '删除库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007004', '3000007004', '', '设置消息通知组', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:notify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000', '4000', 'SettleManage', '结算管理', 'ant-design:credit-card-outlined', NULL, '', NULL, NULL, '11', '/settle', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000001', '4000001', 'SettleInItem', '收入项目', NULL, 0, '/settle/in-item/index', NULL, '4000', '11', '/in-item', 0, 1, 0, 'settle:in-item:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000001001', '4000001001', '', '新增收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000001002', '4000001002', '', '修改收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000001003', '4000001003', '', '导出收入项目', NULL, 0, '', NULL, '4000001', '11', '', 0, 2, 0, 'settle:in-item:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000002', '4000002', 'SettleOutItem', '支出项目', NULL, 0, '/settle/out-item/index', NULL, '4000', '11', '/out-item', 0, 1, 0, 'settle:out-item:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000002001', '4000002001', '', '新增支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000002002', '4000002002', '', '修改支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000002003', '4000002003', '', '导出支出项目', NULL, 0, '', NULL, '4000002', '11', '', 0, 2, 0, 'settle:out-item:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003', '4000003', 'SettleFeeSheet', '供应商费用', NULL, 0, '/settle/fee-sheet/index', NULL, '4000007', '11', '/fee-sheet', 0, 1, 0, 'settle:fee-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003001', '4000003001', '', '新增供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003002', '4000003002', '', '修改供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003003', '4000003003', '', '删除供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003004', '4000003004', '', '审核供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000003005', '4000003005', '', '导出供应商费用单', NULL, 0, '', NULL, '4000003', '11', '', 0, 2, 0, 'settle:fee-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004', '4000004', 'SettlePreSheet', '供应商预付款', NULL, 0, '/settle/pre-sheet/index', NULL, '4000007', '11', '/pre-sheet', 0, 1, 0, 'settle:pre-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004001', '4000004001', '', '新增供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004002', '4000004002', '', '修改供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004003', '4000004003', '', '删除供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004004', '4000004004', '', '审核供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000004005', '4000004005', '', '导出供应商预付款单', NULL, 0, '', NULL, '4000004', '11', '', 0, 2, 0, 'settle:pre-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005', '4000005', 'SettleCheckSheet', '供应商对账', NULL, 0, '/settle/check-sheet/index', NULL, '4000007', '11', '/check-sheet', 0, 1, 0, 'settle:check-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005001', '4000005001', '', '新增供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005002', '4000005002', '', '修改供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005003', '4000005003', '', '删除供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005004', '4000005004', '', '审核供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000005005', '4000005005', '', '导出供应商对账单', NULL, 0, '', NULL, '4000005', '11', '', 0, 2, 0, 'settle:check-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006', '4000006', 'SettleSheet', '供应商结算', NULL, 0, '/settle/sheet/index', NULL, '4000007', '11', '/sheet', 0, 1, 0, 'settle:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006001', '4000006001', '', '新增供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006002', '4000006002', '', '修改供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006003', '4000006003', '', '删除供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006004', '4000006004', '', '审核供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000006005', '4000006005', '', '导出供应商结算单', NULL, 0, '', NULL, '4000006', '11', '', 0, 2, 0, 'settle:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000007', '4000007', 'SupplierSettleManage', '供应商结算', NULL, NULL, '', NULL, '4000', '11', '/supplier', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000008', '4000008', 'CustomerSettleManage', '客户结算', NULL, NULL, '', NULL, '4000', '11', '/customer', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-05 01:21:35', '系统管理员', '1', '2021-07-05 01:21:39'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009', '4000009', 'CustomerSettleFeeSheet', '客户费用', NULL, 0, '/customer-settle/fee-sheet/index', NULL, '4000008', '11', '/fee-sheet', 0, 1, 0, 'customer-settle:fee-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009001', '4000009001', '', '新增客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009002', '4000009002', '', '修改客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009003', '4000009003', '', '删除客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009004', '4000009004', '', '审核客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000009005', '4000009005', '', '导出客户费用单', NULL, 0, '', NULL, '4000009', '11', '', 0, 2, 0, 'customer-settle:fee-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010', '4000010', 'CustomerSettlePreSheet', '客户预收款', NULL, 0, '/customer-settle/pre-sheet/index', NULL, '4000008', '11', '/pre-sheet', 0, 1, 0, 'customer-settle:pre-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010001', '4000010001', '', '新增客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010002', '4000010002', '', '修改客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010003', '4000010003', '', '删除客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010004', '4000010004', '', '审核客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000010005', '4000010005', '', '导出客户预收款单', NULL, 0, '', NULL, '4000010', '11', '', 0, 2, 0, 'customer-settle:pre-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011', '4000011', 'CustomerSettleCheckSheet', '客户对账', NULL, 0, '/customer-settle/check-sheet/index', NULL, '4000008', '11', '/check-sheet', 0, 1, 0, 'customer-settle:check-sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011001', '4000011001', '', '新增客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011002', '4000011002', '', '修改客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011003', '4000011003', '', '删除客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011004', '4000011004', '', '审核客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000011005', '4000011005', '', '导出客户对账单', NULL, 0, '', NULL, '4000011', '11', '', 0, 2, 0, 'customer-settle:check-sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012', '4000012', 'CustomerSettleSheet', '客户结算', NULL, 0, '/customer-settle/sheet/index', NULL, '4000008', '11', '/sheet', 0, 1, 0, 'customer-settle:sheet:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012001', '4000012001', '', '新增客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012002', '4000012002', '', '修改客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012003', '4000012003', '', '删除客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012004', '4000012004', '', '审核客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:approve', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('4000012005', '4000012005', '', '导出客户结算单', NULL, 0, '', NULL, '4000012', '11', '', 0, 2, 0, 'customer-settle:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 10:53:45', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000', '5000', 'Logistics', '物流管理', 'ant-design:gift-outlined', NULL, '', NULL, NULL, '15', '/logistics', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001', '5000001', 'LogisticsSheet', '物流单管理', NULL, 0, '/sc/logistics/sheet/index', NULL, '5000', '15', '/sheet', 0, 1, 0, 'logistics:sheet:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001001', '5000001001', '', '新增物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001002', '5000001002', '', '修改物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 23:23:33', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001003', '5000001003', '', '删除物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001004', '5000001004', '', '物流单发货', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:delivery', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001005', '5000001005', '', '导入物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:import', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('5000001006', '5000001006', '', '导出物流单', NULL, 0, '', NULL, '5000001', '15', '', 0, 2, 0, 'logistics:sheet:export', 1, 1, '', '系统管理员', '1', '2021-05-12 23:24:36', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000', '9000', 'Development', '开发管理', 'ant-design:tool-outlined', NULL, '', NULL, NULL, '12', '/development', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000001', '9000001', 'Qrtz', '定时器管理', NULL, 0, '/development/qrtz/index', NULL, '9000', '12', '/qrtz', 0, 1, 0, 'development:qrtz:manage', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000002', '9000002', 'DataEntity', '数据实体', NULL, 0, '/development/data/entity/index', NULL, '9000', '12', '/data/entity', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000003', '9000003', 'DataObj', '数据对象', NULL, 0, '/development/data/obj/index', NULL, '9000', '12', '/data/obj', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000004', '9000004', 'CustomList', '自定义列表', NULL, 0, '/development/custom/list/index', NULL, '9000', '12', '/custom/list', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000005', '9000005', 'CustomSelector', '自定义选择器', NULL, 0, '/development/custom/selector/index', NULL, '9000', '12', '/custom/selector', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9000008', '9000008', 'CustomPage', '自定义页面', NULL, 0, '/development/custom/page/index', NULL, '9000', '12', '/custom/page', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9001', '9001', 'SmartWork', '便捷办公', 'ant-design:read-outlined', NULL, '', NULL, NULL, '13', '/smart-work', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('9001001', '9001001', 'FileBox', '文件收纳箱', NULL, 0, '/smart-work/file-box/index', NULL, '9001', '13', '/file-box', 0, 1, 0, '', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +COMMIT; -- ---------------------------- -- Table structure for sys_menu_collect -- ---------------------------- DROP TABLE IF EXISTS `sys_menu_collect`; -CREATE TABLE `sys_menu_collect` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', - `menu_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单ID', +CREATE TABLE `sys_menu_collect` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `menu_id` varchar(32) NOT NULL COMMENT '菜单ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `user_id, menu_id`(`user_id`, `menu_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单收藏' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `user_id, menu_id` (`user_id`,`menu_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='菜单收藏'; -- ---------------------------- -- Records of sys_menu_collect -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_notice -- ---------------------------- DROP TABLE IF EXISTS `sys_notice`; -CREATE TABLE `sys_notice` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '内容', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态', - `published` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否发布', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `sys_notice` ( + `id` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT 'ID', + `title` varchar(200) CHARACTER SET utf8mb4 NOT NULL COMMENT '标题', + `content` longtext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '内容', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + `published` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否发布', + `create_by` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `readed_num` int(11) NOT NULL DEFAULT 0 COMMENT '已读人数', - `un_read_num` int(11) NOT NULL DEFAULT 0 COMMENT '未读人数', - `publish_time` datetime NULL DEFAULT NULL COMMENT '发布时间', + `readed_num` int(11) NOT NULL DEFAULT '0' COMMENT '已读人数', + `un_read_num` int(11) NOT NULL DEFAULT '0' COMMENT '未读人数', + `publish_time` datetime DEFAULT NULL COMMENT '发布时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统通知' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='系统通知'; -- ---------------------------- -- Records of sys_notice -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_notice_log -- ---------------------------- DROP TABLE IF EXISTS `sys_notice_log`; -CREATE TABLE `sys_notice_log` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `notice_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', - `readed` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否已读', - `read_time` datetime NULL DEFAULT NULL COMMENT '已读时间', +CREATE TABLE `sys_notice_log` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `notice_id` varchar(32) NOT NULL COMMENT '标题', + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `readed` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已读', + `read_time` datetime DEFAULT NULL COMMENT '已读时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `notice_id`(`notice_id`, `user_id`) USING BTREE, - INDEX `user_id`(`user_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统通知记录' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `notice_id` (`notice_id`,`user_id`) USING BTREE, + KEY `user_id` (`user_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统通知记录'; -- ---------------------------- -- Records of sys_notice_log -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- --- Table structure for sys_parameter +-- Table structure for sys_notify_group -- ---------------------------- -DROP TABLE IF EXISTS `sys_parameter`; -CREATE TABLE `sys_parameter` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', - `pm_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '键', - `pm_value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '值', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +DROP TABLE IF EXISTS `sys_notify_group`; +CREATE TABLE `sys_notify_group` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `receiver_type` tinyint(3) NOT NULL COMMENT '接收者类型', + `message_type` longtext NOT NULL COMMENT '消息类型', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `pm_key`(`pm_key`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统参数' ROW_FORMAT = DYNAMIC; + `available` tinyint(1) NOT NULL COMMENT '状态', + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息通知组'; -- ---------------------------- --- Records of sys_parameter +-- Records of sys_notify_group -- ---------------------------- -INSERT INTO `sys_parameter` VALUES (1, 'tx-map.key', 'OLJBZ-ZFJK6-QWUSK-MB7XT-6UTN2-AWBSY', '腾讯地图Key', '系统管理员', '1', '2022-05-22 04:18:59', '系统管理员', '1', '2022-05-22 04:18:59'); -INSERT INTO `sys_parameter` VALUES (2, 'tx-map.secret', 'secret', '腾讯地图Secret', '系统管理员', '1', '2022-05-22 04:18:59', '系统管理员', '1', '2022-05-22 04:18:59'); -INSERT INTO `sys_parameter` VALUES (3, 'excel-import.max-size', '2000', 'Excel导入最大条数', '系统管理员', '1', '2022-06-10 21:39:32', '系统管理员', '1', '2022-06-10 21:39:32'); -INSERT INTO `sys_parameter` VALUES (8, 'mail', '{\n \"pass\":\"123456\",\n \"sslEnable\":true,\n \"timeOut\":30000,\n \"port\":25,\n \"host\":\"smtp.xingyun.com\",\n \"connectTimeOut\":1000,\n \"from\":\"test@xingyun.com\",\n \"user\":\"test\"\n}', '邮件配置', '系统管理员', '1', '2023-03-14 21:13:44', '系统管理员', '1', '2023-03-14 21:13:44'); -INSERT INTO `sys_parameter` VALUES (9, 'upload.type', 'LOCAL', '上传类型，分为LOCAL、OSS、COS、OBS。LOCAL：服务器本地存储。OSS：阿里云对象存储。COS：腾讯云对象存储。OBS：华为云对象存储', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); -INSERT INTO `sys_parameter` VALUES (10, 'upload.oss.config', '{\"customUrl\":\"\",\"endpoint\":\"yourEndpoint\",\"internalEndPoint\":\"\",\"accessKeyId\":\"yourAccessKeyId\",\"accessKeySecret\":\"yourAccessKeySecret\",\"bucketName\":\"yourBucketName\"}', '阿里云对象存储配置信息，upload.type=OSS时生效，注意：当服务器与OSS同一地域时，建议填写internalEndPoint，此值表示内网endpoint，在上传时会优先使用内网endpoint。customUrl为自定义域名（需带协议）为空代表不使用自定义域名，示例值：https://www.lframework.com。其他参数均在阿里云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); -INSERT INTO `sys_parameter` VALUES (11, 'upload.obs.config', '{\"customUrl\":\"\",\"endpoint\":\"yourEndpoint\",\"ak\":\"yourAccessKeyId\",\"sk\":\"yourAccessKeySecret\",\"bucketName\":\"yourBucketName\"}', '华为云对象存储配置信息，upload.type=OBS时生效。customUrl为自定义域名（需带协议）为空代表不使用自定义域名，示例值：https://www.lframework.com。其他参数均在华为云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); -INSERT INTO `sys_parameter` VALUES (12, 'upload.cos.config', '{\"customUrl\":\"yourCustomUrl\",\"region\":\"yourRegion\",\"secretId\":\"yourSecretId\",\"secretKey\":\"yourSecretKey\",\"bucketName\":\"yourBucketName\"}', '腾讯云对象存储配置信息，upload.type=COS时生效。customUrl为下载文件时的域名，如果使用自定义域名，示例值：https://www.lframework.com，如果不使用自定义域名，那么就填写COS的访问域名。其他参数均在腾讯云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 14:48:02'); +BEGIN; +COMMIT; -- ---------------------------- --- Table structure for sys_position +-- Table structure for sys_notify_group_receiver -- ---------------------------- -DROP TABLE IF EXISTS `sys_position`; -CREATE TABLE `sys_position` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '岗位编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '岗位名称', - `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +DROP TABLE IF EXISTS `sys_notify_group_receiver`; +CREATE TABLE `sys_notify_group_receiver` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `group_id` varchar(20) NOT NULL COMMENT '消息通知组ID', + `receiver_id` varchar(20) NOT NULL COMMENT '接收者ID', + PRIMARY KEY (`id`), + UNIQUE KEY `group_id` (`group_id`,`receiver_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息通知组-接收者关系表'; + +-- ---------------------------- +-- Records of sys_notify_group_receiver +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for sys_parameter +-- ---------------------------- +DROP TABLE IF EXISTS `sys_parameter`; +CREATE TABLE `sys_parameter` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `pm_key` varchar(100) NOT NULL COMMENT '键', + `pm_value` longtext COMMENT '值', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `pm_key` (`pm_key`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统参数'; -- ---------------------------- --- Records of sys_position +-- Records of sys_parameter -- ---------------------------- +BEGIN; +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (1, 'tx-map.key', 'OLJBZ-ZFJK6-QWUSK-MB7XT-6UTN2-AWBSY', '腾讯地图Key', '系统管理员', '1', '2022-05-22 04:18:59', '系统管理员', '1', '2022-05-22 04:18:59'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (2, 'tx-map.secret', 'secret', '腾讯地图Secret', '系统管理员', '1', '2022-05-22 04:18:59', '系统管理员', '1', '2022-05-22 04:18:59'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (3, 'excel-import.max-size', '2000', 'Excel导入最大条数', '系统管理员', '1', '2022-06-10 21:39:32', '系统管理员', '1', '2022-06-10 21:39:32'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (8, 'mail', '{\n \"pass\":\"123456\",\n \"sslEnable\":true,\n \"timeOut\":30000,\n \"port\":25,\n \"host\":\"smtp.xingyun.com\",\n \"connectTimeOut\":1000,\n \"from\":\"test@xingyun.com\",\n \"user\":\"test\"\n}', '邮件配置', '系统管理员', '1', '2023-03-14 21:13:44', '系统管理员', '1', '2023-03-14 21:13:44'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (9, 'upload.type', 'LOCAL', '上传类型，分为LOCAL、OSS、COS、OBS。LOCAL：服务器本地存储。OSS：阿里云对象存储。COS：腾讯云对象存储。OBS：华为云对象存储', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (10, 'upload.oss.config', '{\"customUrl\":\"\",\"endpoint\":\"yourEndpoint\",\"internalEndPoint\":\"\",\"accessKeyId\":\"yourAccessKeyId\",\"accessKeySecret\":\"yourAccessKeySecret\",\"bucketName\":\"yourBucketName\"}', '阿里云对象存储配置信息，upload.type=OSS时生效，注意：当服务器与OSS同一地域时，建议填写internalEndPoint，此值表示内网endpoint，在上传时会优先使用内网endpoint。customUrl为自定义域名（需带协议）为空代表不使用自定义域名，示例值：https://www.lframework.com。其他参数均在阿里云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (11, 'upload.obs.config', '{\"customUrl\":\"\",\"endpoint\":\"yourEndpoint\",\"ak\":\"yourAccessKeyId\",\"sk\":\"yourAccessKeySecret\",\"bucketName\":\"yourBucketName\"}', '华为云对象存储配置信息，upload.type=OBS时生效。customUrl为自定义域名（需带协议）为空代表不使用自定义域名，示例值：https://www.lframework.com。其他参数均在华为云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 10:38:10'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (12, 'upload.cos.config', '{\"customUrl\":\"yourCustomUrl\",\"region\":\"yourRegion\",\"secretId\":\"yourSecretId\",\"secretKey\":\"yourSecretKey\",\"bucketName\":\"yourBucketName\"}', '腾讯云对象存储配置信息，upload.type=COS时生效。customUrl为下载文件时的域名，如果使用自定义域名，示例值：https://www.lframework.com，如果不使用自定义域名，那么就填写COS的访问域名。其他参数均在腾讯云控台获取。', '系统管理员', '1', '2023-06-27 10:38:05', '系统管理员', '1', '2023-06-27 14:48:02'); +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (13, 'login-captcha.enabled', 'true', '登录时是否需要验证码，true：需要；false：不需要。', '系统管理员', '1', '2024-10-16 21:39:32', '系统管理员', '1', '2024-10-16 21:39:32'); +COMMIT; -- ---------------------------- -- Table structure for sys_role -- ---------------------------- DROP TABLE IF EXISTS `sys_role`; -CREATE TABLE `sys_role` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `permission` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限', +CREATE TABLE `sys_role` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `permission` varchar(200) DEFAULT NULL COMMENT '权限', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `name`(`name`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `name` (`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色'; -- ---------------------------- -- Records of sys_role -- ---------------------------- -INSERT INTO `sys_role` VALUES ('1', '001', '系统管理员', 'admin', 1, '系统管理员', '系统管理员', '1', '2021-05-08 18:04:41', '系统管理员', '1', '2021-05-08 18:04:45'); +BEGIN; +INSERT INTO `sys_role` (`id`, `code`, `name`, `permission`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '系统管理员', 'admin', 1, '系统管理员', '系统管理员', '1', '2021-05-08 18:04:41', '系统管理员', '1', '2021-05-08 18:04:45'); +COMMIT; -- ---------------------------- -- Table structure for sys_role_menu -- ---------------------------- DROP TABLE IF EXISTS `sys_role_menu`; -CREATE TABLE `sys_role_menu` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `role_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', - `menu_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单ID', +CREATE TABLE `sys_role_menu` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `role_id` varchar(32) NOT NULL COMMENT '角色ID', + `menu_id` varchar(32) NOT NULL COMMENT '菜单ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `role_id, menu_id`(`role_id`, `menu_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色与菜单关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `role_id, menu_id` (`role_id`,`menu_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='角色与菜单关系表'; -- ---------------------------- -- Records of sys_role_menu -- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for sys_site_message +-- ---------------------------- +DROP TABLE IF EXISTS `sys_site_message`; +CREATE TABLE `sys_site_message` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `title` varchar(100) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `receiver_id` varchar(20) NOT NULL COMMENT '接收人ID', + `biz_key` varchar(20) NOT NULL COMMENT '业务键', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `readed` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已读', + `read_time` datetime DEFAULT NULL COMMENT '已读时间', + PRIMARY KEY (`id`), + KEY `biz_key` (`biz_key`), + KEY `receiver_id` (`receiver_id`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内信'; + +-- ---------------------------- +-- Records of sys_site_message +-- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_user -- ---------------------------- DROP TABLE IF EXISTS `sys_user`; -CREATE TABLE `sys_user` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '姓名', - `username` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户名', - `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '密码', - `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱', - `telephone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', - `gender` tinyint(3) NOT NULL DEFAULT 0 COMMENT '性别 0-未知 1-男 2-女', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态 1-在用 0停用', - `lock_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '锁定状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `sys_user` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '姓名', + `username` varchar(30) NOT NULL COMMENT '用户名', + `password` varchar(100) NOT NULL COMMENT '密码', + `email` varchar(100) DEFAULT NULL COMMENT '邮箱', + `telephone` varchar(11) DEFAULT NULL COMMENT '联系电话', + `gender` tinyint(3) NOT NULL DEFAULT '0' COMMENT '性别 0-未知 1-男 2-女', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 1-在用 0停用', + `lock_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '锁定状态', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - UNIQUE INDEX `username`(`username`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + UNIQUE KEY `username` (`username`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES ('1', '001', '系统管理员', 'admin', '$2a$10$IJtHluhnhAYkgvM4PdKuZek5PWbtuxtjB9pB.twZdxg/qrlR4s4q6', 'xingyun@lframework.com', '17600000001', 0, 1, 0, '', '系统管理员', '1', '2021-04-22 22:00:27', '系统管理员', '1', '2023-03-09 13:30:44'); +BEGIN; +INSERT INTO `sys_user` (`id`, `code`, `name`, `username`, `password`, `email`, `telephone`, `gender`, `available`, `lock_status`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '系统管理员', 'admin', '$2a$10$IJtHluhnhAYkgvM4PdKuZek5PWbtuxtjB9pB.twZdxg/qrlR4s4q6', 'xingyun@lframework.com', '17600000001', 0, 1, 0, '', '系统管理员', '1', '2021-04-22 22:00:27', '系统管理员', '1', '2023-03-09 13:30:44'); +COMMIT; -- ---------------------------- -- Table structure for sys_user_dept -- ---------------------------- DROP TABLE IF EXISTS `sys_user_dept`; -CREATE TABLE `sys_user_dept` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', - `dept_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '部门ID', +CREATE TABLE `sys_user_dept` ( + `id` varchar(32) NOT NULL, + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `dept_id` varchar(32) NOT NULL COMMENT '部门ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `user_id`(`user_id`, `dept_id`) USING BTREE, - INDEX `dept_id`(`dept_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与部门关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `user_id` (`user_id`,`dept_id`) USING BTREE, + KEY `dept_id` (`dept_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户与部门关系表'; -- ---------------------------- -- Records of sys_user_dept -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_user_position -- ---------------------------- DROP TABLE IF EXISTS `sys_user_position`; -CREATE TABLE `sys_user_position` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', - `position_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '岗位ID', +CREATE TABLE `sys_user_position` ( + `id` varchar(32) NOT NULL, + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `position_id` varchar(32) NOT NULL COMMENT '岗位ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `user_id`(`user_id`, `position_id`) USING BTREE, - INDEX `position_id`(`position_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `user_id` (`user_id`,`position_id`) USING BTREE, + KEY `position_id` (`position_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户与岗位关系表'; -- ---------------------------- -- Records of sys_user_position -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for sys_user_role -- ---------------------------- DROP TABLE IF EXISTS `sys_user_role`; -CREATE TABLE `sys_user_role` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', - `role_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', +CREATE TABLE `sys_user_role` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `user_id` varchar(32) NOT NULL COMMENT '用户ID', + `role_id` varchar(32) NOT NULL COMMENT '角色ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `user_id, role_id`(`user_id`, `role_id`) USING BTREE, - INDEX `role_id`(`role_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与角色关系表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `user_id, role_id` (`user_id`,`role_id`) USING BTREE, + KEY `role_id` (`role_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户与角色关系表'; -- ---------------------------- -- Records of sys_user_role -- ---------------------------- -INSERT INTO `sys_user_role` VALUES ('1', '1', '1'); +BEGIN; +INSERT INTO `sys_user_role` (`id`, `user_id`, `role_id`) VALUES ('1', '1', '1'); +COMMIT; -- ---------------------------- -- Table structure for sys_user_telephone -- ---------------------------- DROP TABLE IF EXISTS `sys_user_telephone`; -CREATE TABLE `sys_user_telephone` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `telephone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '手机号', - `user_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户ID', +CREATE TABLE `sys_user_telephone` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `telephone` varchar(11) NOT NULL COMMENT '手机号', + `user_id` varchar(32) DEFAULT NULL COMMENT '用户ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `telephone`(`telephone`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户绑定手机号表' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `telephone` (`telephone`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户绑定手机号表'; -- ---------------------------- -- Records of sys_user_telephone -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_logistics_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_logistics_sheet`; -CREATE TABLE `tbl_logistics_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `logistics_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物流单号', - `logistics_company_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '物流公司ID', - `sender_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人姓名', - `sender_telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人联系电话', - `sender_province_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人省', - `sender_city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人市', - `sender_district_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人区', - `sender_address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '寄件人地址', - `receiver_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人姓名', - `receiver_telephone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人联系电话', - `receiver_province_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人省', - `receiver_city_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人市', - `receiver_district_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人区', - `receiver_address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收件人地址', - `total_weight` decimal(16, 2) NULL DEFAULT NULL COMMENT '总重量（kg）', - `total_volume` decimal(16, 2) NULL DEFAULT NULL COMMENT '总体积（cm3）', - `total_amount` decimal(16, 2) NULL DEFAULT NULL COMMENT '物流费', +CREATE TABLE `tbl_logistics_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '业务单据号', + `logistics_no` varchar(100) DEFAULT NULL COMMENT '物流单号', + `logistics_company_id` varchar(32) NOT NULL COMMENT '物流公司ID', + `sender_name` varchar(100) NOT NULL COMMENT '寄件人姓名', + `sender_telephone` varchar(20) NOT NULL COMMENT '寄件人联系电话', + `sender_province_id` varchar(32) NOT NULL COMMENT '寄件人省', + `sender_city_id` varchar(32) NOT NULL COMMENT '寄件人市', + `sender_district_id` varchar(32) NOT NULL COMMENT '寄件人区', + `sender_address` varchar(200) NOT NULL COMMENT '寄件人地址', + `receiver_name` varchar(100) NOT NULL COMMENT '收件人姓名', + `receiver_telephone` varchar(20) NOT NULL COMMENT '收件人联系电话', + `receiver_province_id` varchar(32) NOT NULL COMMENT '收件人省', + `receiver_city_id` varchar(32) NOT NULL COMMENT '收件人市', + `receiver_district_id` varchar(32) NOT NULL COMMENT '收件人区', + `receiver_address` varchar(200) NOT NULL COMMENT '收件人地址', + `total_weight` decimal(16,2) DEFAULT NULL COMMENT '总重量（kg）', + `total_volume` decimal(16,2) DEFAULT NULL COMMENT '总体积（cm3）', + `total_amount` decimal(16,2) DEFAULT NULL COMMENT '物流费', `status` tinyint(3) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `delivery_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发货人', - `delivery_time` datetime NULL DEFAULT NULL COMMENT '发货时间', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `delivery_by` varchar(32) DEFAULT NULL COMMENT '发货人', + `delivery_time` datetime DEFAULT NULL COMMENT '发货时间', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `logistics_no`(`logistics_no`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物流单' ROW_FORMAT = Dynamic; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `logistics_no` (`logistics_no`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='物流单'; -- ---------------------------- -- Records of tbl_logistics_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_logistics_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_logistics_sheet_detail`; -CREATE TABLE `tbl_logistics_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '物流单ID', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据ID', +CREATE TABLE `tbl_logistics_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '物流单ID', + `biz_id` varchar(32) NOT NULL COMMENT '业务单据ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX ```biz_id```(`biz_id`, `biz_type`) USING BTREE, - INDEX `sheet_id`(`sheet_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物流单明细' ROW_FORMAT = Dynamic; + UNIQUE KEY ```biz_id``` (`biz_id`,`biz_type`) USING BTREE, + KEY `sheet_id` (`sheet_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='物流单明细'; -- ---------------------------- -- Records of tbl_logistics_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_order_chart -- ---------------------------- DROP TABLE IF EXISTS `tbl_order_chart`; -CREATE TABLE `tbl_order_chart` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `total_amount` decimal(24, 2) NOT NULL COMMENT '单据总金额', +CREATE TABLE `tbl_order_chart` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `total_amount` decimal(24,2) NOT NULL COMMENT '单据总金额', `create_time` datetime NOT NULL COMMENT '创建时间', - `create_date` varchar(19) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建日期', - `create_hour` varchar(13) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建时间（小时）', + `create_date` varchar(19) NOT NULL COMMENT '创建日期', + `create_hour` varchar(13) NOT NULL COMMENT '创建时间（小时）', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', PRIMARY KEY (`id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `create_date`(`create_date`) USING BTREE, - INDEX `create_hour`(`create_hour`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单图表数据' ROW_FORMAT = DYNAMIC; + KEY `create_time` (`create_time`) USING BTREE, + KEY `create_date` (`create_date`) USING BTREE, + KEY `create_hour` (`create_hour`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单图表数据'; -- ---------------------------- -- Records of tbl_order_chart -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_order_pay_type -- ---------------------------- DROP TABLE IF EXISTS `tbl_order_pay_type`; -CREATE TABLE `tbl_order_pay_type` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单ID', - `pay_type_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '支付方式ID', - `pay_amount` decimal(24, 2) NOT NULL COMMENT '支付金额', - `text` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付内容', +CREATE TABLE `tbl_order_pay_type` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '订单ID', + `pay_type_id` varchar(32) NOT NULL COMMENT '支付方式ID', + `pay_amount` decimal(24,2) NOT NULL COMMENT '支付金额', + `text` varchar(200) DEFAULT NULL COMMENT '支付内容', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单支付方式' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单支付方式'; -- ---------------------------- -- Records of tbl_order_pay_type -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_order_time_line -- ---------------------------- DROP TABLE IF EXISTS `tbl_order_time_line`; -CREATE TABLE `tbl_order_time_line` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '描述内容', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_order_time_line` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '单据ID', + `content` longtext COMMENT '描述内容', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '单据时间轴' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='单据时间轴'; -- ---------------------------- -- Records of tbl_order_time_line -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_pre_take_stock_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_pre_take_stock_sheet`; -CREATE TABLE `tbl_pre_take_stock_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', +CREATE TABLE `tbl_pre_take_stock_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '业务单据号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', `take_status` tinyint(3) NOT NULL COMMENT '盘点状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预先盘点单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存预先盘点单'; -- ---------------------------- -- Records of tbl_pre_take_stock_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_pre_take_stock_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_pre_take_stock_sheet_detail`; -CREATE TABLE `tbl_pre_take_stock_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预先盘点单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', - `first_num` int(11) NULL DEFAULT NULL COMMENT '初盘数量', - `second_num` int(11) NULL DEFAULT NULL COMMENT '复盘数量', - `rand_num` int(11) NULL DEFAULT NULL COMMENT '抽盘数量', +CREATE TABLE `tbl_pre_take_stock_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '预先盘点单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', + `first_num` int(11) DEFAULT NULL COMMENT '初盘数量', + `second_num` int(11) DEFAULT NULL COMMENT '复盘数量', + `rand_num` int(11) DEFAULT NULL COMMENT '抽盘数量', `order_no` int(11) NOT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存预先盘点单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存预先盘点单明细'; -- ---------------------------- -- Records of tbl_pre_take_stock_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_product_stock -- ---------------------------- DROP TABLE IF EXISTS `tbl_product_stock`; -CREATE TABLE `tbl_product_stock` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', - `stock_num` int(11) NOT NULL DEFAULT 0 COMMENT '库存数量', - `tax_price` decimal(24, 6) NOT NULL COMMENT '含税价格', - `tax_amount` decimal(24, 2) NOT NULL COMMENT '含税金额', +CREATE TABLE `tbl_product_stock` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', + `stock_num` int(11) NOT NULL DEFAULT '0' COMMENT '库存数量', + `tax_price` decimal(24,6) NOT NULL COMMENT '含税价格', + `tax_amount` decimal(24,2) NOT NULL COMMENT '含税金额', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `product_id`(`product_id`, `sc_id`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `product_id` (`product_id`,`sc_id`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品库存'; -- ---------------------------- -- Records of tbl_product_stock -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_product_stock_log -- ---------------------------- DROP TABLE IF EXISTS `tbl_product_stock_log`; -CREATE TABLE `tbl_product_stock_log` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', - `ori_tax_price` decimal(24, 6) NOT NULL COMMENT '原含税成本价', - `cur_tax_price` decimal(24, 6) NOT NULL COMMENT '现含税成本价', +CREATE TABLE `tbl_product_stock_log` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', + `ori_tax_price` decimal(24,6) NOT NULL COMMENT '原含税成本价', + `cur_tax_price` decimal(24,6) NOT NULL COMMENT '现含税成本价', `ori_stock_num` int(11) NOT NULL, `cur_stock_num` int(11) NOT NULL, - `stock_num` int(11) NOT NULL DEFAULT 0 COMMENT '库存数量', - `tax_amount` decimal(24, 2) NOT NULL COMMENT '含税金额', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `stock_num` int(11) NOT NULL DEFAULT '0' COMMENT '库存数量', + `tax_amount` decimal(24,2) NOT NULL COMMENT '含税金额', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `biz_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务单据ID', - `biz_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务单据号', - `biz_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务单据明细ID', + `biz_id` varchar(32) DEFAULT NULL COMMENT '业务单据ID', + `biz_code` varchar(32) DEFAULT NULL COMMENT '业务单据号', + `biz_detail_id` varchar(32) DEFAULT NULL COMMENT '业务单据明细ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', PRIMARY KEY (`id`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商品库存变动记录' ROW_FORMAT = DYNAMIC; + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品库存变动记录'; -- ---------------------------- -- Records of tbl_product_stock_log -- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for tbl_product_stock_warning +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_product_stock_warning`; +CREATE TABLE `tbl_product_stock_warning` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `sc_id` varchar(20) NOT NULL COMMENT '仓库ID', + `product_id` varchar(20) NOT NULL COMMENT '商品ID', + `max_limit` int(11) NOT NULL DEFAULT '0' COMMENT '预警上限', + `min_limit` int(11) NOT NULL DEFAULT '0' COMMENT '预警下限', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `sc_id` (`sc_id`,`product_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存预警'; + +-- ---------------------------- +-- Records of tbl_product_stock_warning +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for tbl_product_stock_warning_notify +-- ---------------------------- +DROP TABLE IF EXISTS `tbl_product_stock_warning_notify`; +CREATE TABLE `tbl_product_stock_warning_notify` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `notify_group_id` varchar(20) NOT NULL COMMENT '通知组ID', + PRIMARY KEY (`id`), + UNIQUE KEY `notify_group_id` (`notify_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存预警通知组'; + +-- ---------------------------- +-- Records of tbl_product_stock_warning_notify +-- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_purchase_config -- ---------------------------- DROP TABLE IF EXISTS `tbl_purchase_config`; -CREATE TABLE `tbl_purchase_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `receive_require_purchase` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购收货单是否关联采购订单', - `receive_multiple_relate_purchase` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购收货单是否多次关联采购订单', - `purchase_return_require_receive` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购退货单是否关联采购收货单', - `purchase_return_multiple_relate_receive` tinyint(1) NOT NULL DEFAULT 0 COMMENT '采购退货单是否多次关联采购收货单', +CREATE TABLE `tbl_purchase_config` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `receive_require_purchase` tinyint(1) NOT NULL DEFAULT '0' COMMENT '采购收货单是否关联采购订单', + `receive_multiple_relate_purchase` tinyint(1) NOT NULL DEFAULT '0' COMMENT '采购收货单是否多次关联采购订单', + `purchase_return_require_receive` tinyint(1) NOT NULL DEFAULT '0' COMMENT '采购退货单是否关联采购收货单', + `purchase_return_multiple_relate_receive` tinyint(1) NOT NULL DEFAULT '0' COMMENT '采购退货单是否多次关联采购收货单', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购参数设置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购参数设置'; -- ---------------------------- -- Records of tbl_purchase_config -- ---------------------------- -INSERT INTO `tbl_purchase_config` VALUES ('1', 1, 1, 1, 1); +BEGIN; +INSERT INTO `tbl_purchase_config` (`id`, `receive_require_purchase`, `receive_multiple_relate_purchase`, `purchase_return_require_receive`, `purchase_return_multiple_relate_receive`) VALUES ('1', 1, 1, 1, 1); +COMMIT; -- ---------------------------- -- Table structure for tbl_purchase_order -- ---------------------------- DROP TABLE IF EXISTS `tbl_purchase_order`; -CREATE TABLE `tbl_purchase_order` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `purchaser_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购员ID', - `expect_arrive_date` date NULL DEFAULT NULL COMMENT '预计到货日期', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '采购数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '采购金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_purchase_order` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `purchaser_id` varchar(32) DEFAULT NULL COMMENT '采购员ID', + `expect_arrive_date` date DEFAULT NULL COMMENT '预计到货日期', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '采购数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '采购金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购订单'; -- ---------------------------- -- Records of tbl_purchase_order -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_purchase_order_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_purchase_order_detail`; -CREATE TABLE `tbl_purchase_order_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_purchase_order_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '订单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `order_num` int(11) NOT NULL COMMENT '采购数量', - `tax_price` decimal(16, 2) NOT NULL COMMENT '采购价', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `tax_price` decimal(16,2) NOT NULL COMMENT '采购价', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `receive_num` int(11) NOT NULL DEFAULT 0 COMMENT '已收货数量', + `receive_num` int(11) NOT NULL DEFAULT '0' COMMENT '已收货数量', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购订单明细' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购订单明细'; -- ---------------------------- -- Records of tbl_purchase_order_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_purchase_return -- ---------------------------- DROP TABLE IF EXISTS `tbl_purchase_return`; -CREATE TABLE `tbl_purchase_return` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `purchaser_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `receive_sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货单ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '退货金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_purchase_return` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `purchaser_id` varchar(32) DEFAULT NULL COMMENT '采购员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `receive_sheet_id` varchar(32) DEFAULT NULL COMMENT '收货单ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '退货金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `tx_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事务ID', - `ori_settle_status` tinyint(3) NULL DEFAULT NULL COMMENT '结算状态中间态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `tx_id` varchar(100) DEFAULT NULL COMMENT '事务ID', + `ori_settle_status` tinyint(3) DEFAULT NULL COMMENT '结算状态中间态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE, - INDEX `receive_sheet_id`(`receive_sheet_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购退单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE, + KEY `receive_sheet_id` (`receive_sheet_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购退单'; -- ---------------------------- -- Records of tbl_purchase_return -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_purchase_return_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_purchase_return_detail`; -CREATE TABLE `tbl_purchase_return_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `return_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收货单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_purchase_return_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `return_id` varchar(32) NOT NULL COMMENT '收货单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `return_num` int(11) NOT NULL COMMENT '退货数量', - `tax_price` decimal(16, 2) NOT NULL COMMENT '采购价', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `tax_price` decimal(16,2) NOT NULL COMMENT '采购价', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `receive_sheet_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收货单明细ID', + `receive_sheet_detail_id` varchar(32) DEFAULT NULL COMMENT '收货单明细ID', PRIMARY KEY (`id`) USING BTREE, - INDEX `return_id`(`return_id`) USING BTREE, - INDEX `receive_sheet_detail_id`(`receive_sheet_detail_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购退单明细' ROW_FORMAT = DYNAMIC; + KEY `return_id` (`return_id`) USING BTREE, + KEY `receive_sheet_detail_id` (`receive_sheet_detail_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购退单明细'; -- ---------------------------- -- Records of tbl_purchase_return_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_receive_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_receive_sheet`; -CREATE TABLE `tbl_receive_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `supplier_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '供应商ID', - `purchaser_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `receive_date` date NULL DEFAULT NULL COMMENT '到货日期', - `purchase_order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购单ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '收货金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_receive_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `supplier_id` varchar(32) NOT NULL COMMENT '供应商ID', + `purchaser_id` varchar(32) DEFAULT NULL COMMENT '采购员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `receive_date` date DEFAULT NULL COMMENT '到货日期', + `purchase_order_id` varchar(32) DEFAULT NULL COMMENT '采购单ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '收货金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `tx_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事务ID', - `ori_settle_status` tinyint(3) NULL DEFAULT NULL COMMENT '结算状态中间态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `tx_id` varchar(100) DEFAULT NULL COMMENT '事务ID', + `ori_settle_status` tinyint(3) DEFAULT NULL COMMENT '结算状态中间态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `supplier_id`(`supplier_id`) USING BTREE, - INDEX `purchase_order_id`(`purchase_order_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购收货单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `supplier_id` (`supplier_id`) USING BTREE, + KEY `purchase_order_id` (`purchase_order_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购收货单'; -- ---------------------------- -- Records of tbl_receive_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_receive_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_receive_sheet_detail`; -CREATE TABLE `tbl_receive_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收货单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_receive_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '收货单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `order_num` int(11) NOT NULL COMMENT '采购数量', - `tax_price` decimal(16, 2) NOT NULL COMMENT '采购价', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `tax_price` decimal(16,2) NOT NULL COMMENT '采购价', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `purchase_order_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '采购订单明细ID', - `return_num` int(11) NOT NULL DEFAULT 0 COMMENT '已退货数量', + `purchase_order_detail_id` varchar(32) DEFAULT NULL COMMENT '采购订单明细ID', + `return_num` int(11) NOT NULL DEFAULT '0' COMMENT '已退货数量', PRIMARY KEY (`id`) USING BTREE, - INDEX `sheet_id`(`sheet_id`) USING BTREE, - INDEX `purchase_order_detail_id`(`purchase_order_detail_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '采购收货单明细' ROW_FORMAT = DYNAMIC; + KEY `sheet_id` (`sheet_id`) USING BTREE, + KEY `purchase_order_detail_id` (`purchase_order_detail_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='采购收货单明细'; -- ---------------------------- -- Records of tbl_receive_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_config -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_config`; -CREATE TABLE `tbl_retail_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `retail_out_sheet_require_member` tinyint(1) NOT NULL DEFAULT 1 COMMENT '零售出库单上的会员是否必填', - `retail_return_require_out_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '零售退货单是否关联零售出库单', - `retail_return_multiple_relate_out_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '零售退货单是否多次关联零售出库单', - `retail_return_require_member` tinyint(1) NOT NULL DEFAULT 1 COMMENT '零售退货单上的会员是否必填', - `retail_out_sheet_require_logistics` tinyint(1) NOT NULL DEFAULT 0 COMMENT '零售出库单是否需要发货', +CREATE TABLE `tbl_retail_config` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `retail_out_sheet_require_member` tinyint(1) NOT NULL DEFAULT '1' COMMENT '零售出库单上的会员是否必填', + `retail_return_require_out_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '零售退货单是否关联零售出库单', + `retail_return_multiple_relate_out_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '零售退货单是否多次关联零售出库单', + `retail_return_require_member` tinyint(1) NOT NULL DEFAULT '1' COMMENT '零售退货单上的会员是否必填', + `retail_out_sheet_require_logistics` tinyint(1) NOT NULL DEFAULT '0' COMMENT '零售出库单是否需要发货', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售参数设置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售参数设置'; -- ---------------------------- -- Records of tbl_retail_config -- ---------------------------- -INSERT INTO `tbl_retail_config` VALUES ('1', 0, 0, 1, 0, 0); +BEGIN; +INSERT INTO `tbl_retail_config` (`id`, `retail_out_sheet_require_member`, `retail_return_require_out_stock`, `retail_return_multiple_relate_out_stock`, `retail_return_require_member`, `retail_out_sheet_require_logistics`) VALUES ('1', 0, 0, 1, 0, 0); +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_out_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_out_sheet`; -CREATE TABLE `tbl_retail_out_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `member_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会员ID', - `saler_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '出库金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_retail_out_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `member_id` varchar(32) DEFAULT NULL COMMENT '会员ID', + `saler_id` varchar(32) DEFAULT NULL COMMENT '销售员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '出库金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `member_id`(`member_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售出库单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `member_id` (`member_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售出库单'; -- ---------------------------- -- Records of tbl_retail_out_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_out_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_out_sheet_detail`; -CREATE TABLE `tbl_retail_out_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_retail_out_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '出库单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `order_num` int(11) NOT NULL COMMENT '出库数量', - `ori_price` decimal(16, 2) NOT NULL COMMENT '原价', - `tax_price` decimal(16, 2) NOT NULL COMMENT '现价', - `discount_rate` decimal(16, 2) NOT NULL COMMENT '折扣率（%）', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `ori_price` decimal(16,2) NOT NULL COMMENT '原价', + `tax_price` decimal(16,2) NOT NULL COMMENT '现价', + `discount_rate` decimal(16,2) NOT NULL COMMENT '折扣率（%）', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `return_num` int(11) NOT NULL DEFAULT 0 COMMENT '已退货数量', - `ori_bundle_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组合商品原始明细ID', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `return_num` int(11) NOT NULL DEFAULT '0' COMMENT '已退货数量', + `ori_bundle_detail_id` varchar(32) DEFAULT NULL COMMENT '组合商品原始明细ID', PRIMARY KEY (`id`) USING BTREE, - INDEX `sheet_id`(`sheet_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售出库单明细' ROW_FORMAT = DYNAMIC; + KEY `sheet_id` (`sheet_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售出库单明细'; -- ---------------------------- -- Records of tbl_retail_out_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_out_sheet_detail_bundle -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_out_sheet_detail_bundle`; -CREATE TABLE `tbl_retail_out_sheet_detail_bundle` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', - `main_product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组合商品ID', - `order_num` int(11) NOT NULL DEFAULT 0 COMMENT '组合商品数量', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品ID', +CREATE TABLE `tbl_retail_out_sheet_detail_bundle` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '出库单ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', + `main_product_id` varchar(32) NOT NULL COMMENT '组合商品ID', + `order_num` int(11) NOT NULL DEFAULT '0' COMMENT '组合商品数量', + `product_id` varchar(32) NOT NULL COMMENT '单品ID', `product_order_num` int(11) NOT NULL COMMENT '单品数量', - `product_ori_price` decimal(16, 2) NOT NULL COMMENT '单品原价', - `product_tax_price` decimal(16, 2) NOT NULL COMMENT '单品含税价格', - `product_tax_rate` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品税率', - `product_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单品明细ID', + `product_ori_price` decimal(16,2) NOT NULL COMMENT '单品原价', + `product_tax_price` decimal(16,2) NOT NULL COMMENT '单品含税价格', + `product_tax_rate` varchar(16) NOT NULL COMMENT '单品税率', + `product_detail_id` varchar(32) DEFAULT NULL COMMENT '单品明细ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_detail_id`) USING BTREE, - INDEX `detail_id`(`detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售出库单组合商品明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`product_detail_id`) USING BTREE, + KEY `detail_id` (`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售出库单组合商品明细'; -- ---------------------------- -- Records of tbl_retail_out_sheet_detail_bundle -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_out_sheet_detail_lot -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_out_sheet_detail_lot`; -CREATE TABLE `tbl_retail_out_sheet_detail_lot` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', +CREATE TABLE `tbl_retail_out_sheet_detail_lot` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', `order_num` int(11) NOT NULL COMMENT '出库数量', - `return_num` int(11) NOT NULL DEFAULT 0 COMMENT '已退货数量', - `cost_tax_amount` decimal(24, 2) NOT NULL COMMENT '含税成本金额', + `return_num` int(11) NOT NULL DEFAULT '0' COMMENT '已退货数量', + `cost_tax_amount` decimal(24,2) NOT NULL COMMENT '含税成本金额', `settle_status` tinyint(3) NOT NULL COMMENT '结算状态', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - INDEX `detail_id`(`detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售出库单批次明细' ROW_FORMAT = DYNAMIC; + KEY `detail_id` (`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售出库单批次明细'; -- ---------------------------- -- Records of tbl_retail_out_sheet_detail_lot -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_return -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_return`; -CREATE TABLE `tbl_retail_return` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `member_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会员ID', - `saler_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `out_sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '退货金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_retail_return` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `member_id` varchar(32) DEFAULT NULL COMMENT '会员ID', + `saler_id` varchar(32) DEFAULT NULL COMMENT '销售员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `out_sheet_id` varchar(32) DEFAULT NULL COMMENT '出库单ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '退货金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `out_sheet_id`(`out_sheet_id`) USING BTREE, - INDEX `member_id`(`member_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售退单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `out_sheet_id` (`out_sheet_id`) USING BTREE, + KEY `member_id` (`member_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售退单'; -- ---------------------------- -- Records of tbl_retail_return -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_retail_return_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_retail_return_detail`; -CREATE TABLE `tbl_retail_return_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `return_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '退货单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_retail_return_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `return_id` varchar(32) NOT NULL COMMENT '退货单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `return_num` int(11) NOT NULL COMMENT '退货数量', - `ori_price` decimal(16, 2) NOT NULL COMMENT '原价', - `tax_price` decimal(16, 2) NOT NULL COMMENT '现价', - `discount_rate` decimal(16, 2) NOT NULL COMMENT '折扣率（%）', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `ori_price` decimal(16,2) NOT NULL COMMENT '原价', + `tax_price` decimal(16,2) NOT NULL COMMENT '现价', + `discount_rate` decimal(16,2) NOT NULL COMMENT '折扣率（%）', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `out_sheet_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单明细ID', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `out_sheet_detail_id` varchar(32) DEFAULT NULL COMMENT '出库单明细ID', PRIMARY KEY (`id`) USING BTREE, - INDEX `return_id`(`return_id`) USING BTREE, - INDEX `out_sheet_detail_id`(`out_sheet_detail_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '零售退单明细' ROW_FORMAT = DYNAMIC; + KEY `return_id` (`return_id`) USING BTREE, + KEY `out_sheet_detail_id` (`out_sheet_detail_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='零售退单明细'; -- ---------------------------- -- Records of tbl_retail_return_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_config -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_config`; -CREATE TABLE `tbl_sale_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `out_stock_require_sale` tinyint(1) NOT NULL DEFAULT 0 COMMENT '销售出库单是否关联销售订单', - `out_stock_multiple_relate_sale` tinyint(1) NOT NULL DEFAULT 0 COMMENT '销售出库单是否多次关联销售订单', - `sale_return_require_out_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '销售退货单是否关联销售出库单', - `sale_return_multiple_relate_out_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '销售退货单是否多次关联销售出库单', - `out_stock_require_logistics` tinyint(1) NOT NULL DEFAULT 0 COMMENT '销售出库单是否需要物流单', +CREATE TABLE `tbl_sale_config` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `out_stock_require_sale` tinyint(1) NOT NULL DEFAULT '0' COMMENT '销售出库单是否关联销售订单', + `out_stock_multiple_relate_sale` tinyint(1) NOT NULL DEFAULT '0' COMMENT '销售出库单是否多次关联销售订单', + `sale_return_require_out_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '销售退货单是否关联销售出库单', + `sale_return_multiple_relate_out_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '销售退货单是否多次关联销售出库单', + `out_stock_require_logistics` tinyint(1) NOT NULL DEFAULT '0' COMMENT '销售出库单是否需要物流单', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售参数设置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售参数设置'; -- ---------------------------- -- Records of tbl_sale_config -- ---------------------------- -INSERT INTO `tbl_sale_config` VALUES ('1', 0, 0, 0, 0, 0); +BEGIN; +INSERT INTO `tbl_sale_config` (`id`, `out_stock_require_sale`, `out_stock_multiple_relate_sale`, `sale_return_require_out_stock`, `sale_return_multiple_relate_out_stock`, `out_stock_require_logistics`) VALUES ('1', 0, 0, 0, 0, 0); +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_order -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_order`; -CREATE TABLE `tbl_sale_order` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `saler_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售员ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '销售数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '销售金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_sale_order` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `saler_id` varchar(32) DEFAULT NULL COMMENT '销售员ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '销售数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '销售金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售订单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售订单'; -- ---------------------------- -- Records of tbl_sale_order -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_order_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_order_detail`; -CREATE TABLE `tbl_sale_order_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '订单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_sale_order_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '订单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `order_num` int(11) NOT NULL COMMENT '销售数量', - `ori_price` decimal(16, 2) NOT NULL COMMENT '原价', - `tax_price` decimal(16, 2) NOT NULL COMMENT '现价', - `discount_rate` decimal(16, 2) NOT NULL COMMENT '折扣率（%）', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `ori_price` decimal(16,2) NOT NULL COMMENT '原价', + `tax_price` decimal(16,2) NOT NULL COMMENT '现价', + `discount_rate` decimal(16,2) NOT NULL COMMENT '折扣率（%）', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `out_num` int(11) NOT NULL DEFAULT 0 COMMENT '已出库数量', - `ori_bundle_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组合商品原始明细ID', + `out_num` int(11) NOT NULL DEFAULT '0' COMMENT '已出库数量', + `ori_bundle_detail_id` varchar(32) DEFAULT NULL COMMENT '组合商品原始明细ID', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售订单明细' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售订单明细'; -- ---------------------------- -- Records of tbl_sale_order_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_order_detail_bundle -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_order_detail_bundle`; -CREATE TABLE `tbl_sale_order_detail_bundle` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '销售单ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', - `main_product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组合商品ID', - `order_num` int(11) NOT NULL DEFAULT 0 COMMENT '组合商品数量', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品ID', +CREATE TABLE `tbl_sale_order_detail_bundle` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '销售单ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', + `main_product_id` varchar(32) NOT NULL COMMENT '组合商品ID', + `order_num` int(11) NOT NULL DEFAULT '0' COMMENT '组合商品数量', + `product_id` varchar(32) NOT NULL COMMENT '单品ID', `product_order_num` int(11) NOT NULL COMMENT '单品数量', - `product_ori_price` decimal(16, 2) NOT NULL COMMENT '单品原价', - `product_tax_price` decimal(16, 2) NOT NULL COMMENT '单品含税价格', - `product_tax_rate` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品税率', - `product_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单品明细ID', + `product_ori_price` decimal(16,2) NOT NULL COMMENT '单品原价', + `product_tax_price` decimal(16,2) NOT NULL COMMENT '单品含税价格', + `product_tax_rate` varchar(16) NOT NULL COMMENT '单品税率', + `product_detail_id` varchar(32) DEFAULT NULL COMMENT '单品明细ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `order_id`(`order_id`, `product_detail_id`) USING BTREE, - INDEX `detail_id`(`detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售单组合商品明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `order_id` (`order_id`,`product_detail_id`) USING BTREE, + KEY `detail_id` (`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售单组合商品明细'; -- ---------------------------- -- Records of tbl_sale_order_detail_bundle -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_out_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_out_sheet`; -CREATE TABLE `tbl_sale_out_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `saler_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `sale_order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售单ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '出库金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_sale_out_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `saler_id` varchar(32) DEFAULT NULL COMMENT '销售员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `sale_order_id` varchar(32) DEFAULT NULL COMMENT '销售单ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '出库金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `tx_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事务ID', - `ori_settle_status` tinyint(3) NULL DEFAULT NULL COMMENT '结算状态中间态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `tx_id` varchar(100) DEFAULT NULL COMMENT '事务ID', + `ori_settle_status` tinyint(3) DEFAULT NULL COMMENT '结算状态中间态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE, - INDEX `sale_order_id`(`sale_order_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售出库单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE, + KEY `sale_order_id` (`sale_order_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售出库单'; -- ---------------------------- -- Records of tbl_sale_out_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_out_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_out_sheet_detail`; -CREATE TABLE `tbl_sale_out_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_sale_out_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '出库单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `order_num` int(11) NOT NULL COMMENT '出库数量', - `ori_price` decimal(16, 2) NOT NULL COMMENT '原价', - `tax_price` decimal(16, 2) NOT NULL COMMENT '现价', - `discount_rate` decimal(16, 2) NOT NULL COMMENT '折扣率（%）', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `ori_price` decimal(16,2) NOT NULL COMMENT '原价', + `tax_price` decimal(16,2) NOT NULL COMMENT '现价', + `discount_rate` decimal(16,2) NOT NULL COMMENT '折扣率（%）', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `sale_order_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售订单明细ID', - `ori_bundle_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组合商品原始明细ID', - `return_num` int(11) NOT NULL DEFAULT 0 COMMENT '已退货数量', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `sale_order_detail_id` varchar(32) DEFAULT NULL COMMENT '销售订单明细ID', + `ori_bundle_detail_id` varchar(32) DEFAULT NULL COMMENT '组合商品原始明细ID', + `return_num` int(11) NOT NULL DEFAULT '0' COMMENT '已退货数量', PRIMARY KEY (`id`) USING BTREE, - INDEX `sheet_id`(`sheet_id`) USING BTREE, - INDEX `purchase_order_detail_id`(`sale_order_detail_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售出库单明细' ROW_FORMAT = DYNAMIC; + KEY `sheet_id` (`sheet_id`) USING BTREE, + KEY `purchase_order_detail_id` (`sale_order_detail_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售出库单明细'; -- ---------------------------- -- Records of tbl_sale_out_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_out_sheet_detail_bundle -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_out_sheet_detail_bundle`; -CREATE TABLE `tbl_sale_out_sheet_detail_bundle` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '出库单ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', - `main_product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组合商品ID', - `order_num` int(11) NOT NULL DEFAULT 0 COMMENT '组合商品数量', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品ID', +CREATE TABLE `tbl_sale_out_sheet_detail_bundle` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '出库单ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', + `main_product_id` varchar(32) NOT NULL COMMENT '组合商品ID', + `order_num` int(11) NOT NULL DEFAULT '0' COMMENT '组合商品数量', + `product_id` varchar(32) NOT NULL COMMENT '单品ID', `product_order_num` int(11) NOT NULL COMMENT '单品数量', - `product_ori_price` decimal(16, 2) NOT NULL COMMENT '单品原价', - `product_tax_price` decimal(16, 2) NOT NULL COMMENT '单品含税价格', - `product_tax_rate` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单品税率', - `product_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单品明细ID', + `product_ori_price` decimal(16,2) NOT NULL COMMENT '单品原价', + `product_tax_price` decimal(16,2) NOT NULL COMMENT '单品含税价格', + `product_tax_rate` varchar(16) NOT NULL COMMENT '单品税率', + `product_detail_id` varchar(32) DEFAULT NULL COMMENT '单品明细ID', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_detail_id`) USING BTREE, - INDEX `detail_id`(`detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售出库单组合商品明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`product_detail_id`) USING BTREE, + KEY `detail_id` (`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售出库单组合商品明细'; -- ---------------------------- -- Records of tbl_sale_out_sheet_detail_bundle -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_out_sheet_detail_lot -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_out_sheet_detail_lot`; -CREATE TABLE `tbl_sale_out_sheet_detail_lot` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', +CREATE TABLE `tbl_sale_out_sheet_detail_lot` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', `order_num` int(11) NOT NULL COMMENT '出库数量', - `return_num` int(11) NOT NULL DEFAULT 0 COMMENT '已退货数量', - `cost_tax_amount` decimal(24, 2) NOT NULL COMMENT '含税成本金额', + `return_num` int(11) NOT NULL DEFAULT '0' COMMENT '已退货数量', + `cost_tax_amount` decimal(24,2) NOT NULL COMMENT '含税成本金额', `settle_status` tinyint(3) NOT NULL COMMENT '结算状态', `order_no` int(11) NOT NULL COMMENT '排序编号', PRIMARY KEY (`id`) USING BTREE, - INDEX `detail_id`(`detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售出库单批次明细' ROW_FORMAT = DYNAMIC; + KEY `detail_id` (`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售出库单批次明细'; -- ---------------------------- -- Records of tbl_sale_out_sheet_detail_lot -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_return -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_return`; -CREATE TABLE `tbl_sale_return` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `customer_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID', - `saler_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售员ID', - `payment_date` date NULL DEFAULT NULL COMMENT '付款日期', - `out_sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '商品数量', - `total_gift_num` int(11) NOT NULL DEFAULT 0 COMMENT '赠品数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '退货金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_sale_return` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', + `customer_id` varchar(32) NOT NULL COMMENT '客户ID', + `saler_id` varchar(32) DEFAULT NULL COMMENT '销售员ID', + `payment_date` date DEFAULT NULL COMMENT '付款日期', + `out_sheet_id` varchar(32) DEFAULT NULL COMMENT '出库单ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '商品数量', + `total_gift_num` int(11) NOT NULL DEFAULT '0' COMMENT '赠品数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '退货金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `tx_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事务ID', - `ori_settle_status` tinyint(3) NULL DEFAULT NULL COMMENT '结算状态中间态', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `tx_id` varchar(100) DEFAULT NULL COMMENT '事务ID', + `ori_settle_status` tinyint(3) DEFAULT NULL COMMENT '结算状态中间态', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE, - INDEX `customer_id`(`customer_id`) USING BTREE, - INDEX `out_sheet_id`(`out_sheet_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售退单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE, + KEY `customer_id` (`customer_id`) USING BTREE, + KEY `out_sheet_id` (`out_sheet_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售退单'; -- ---------------------------- -- Records of tbl_sale_return -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sale_return_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_sale_return_detail`; -CREATE TABLE `tbl_sale_return_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `return_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '退货单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_sale_return_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `return_id` varchar(32) NOT NULL COMMENT '退货单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `return_num` int(11) NOT NULL COMMENT '退货数量', - `ori_price` decimal(16, 2) NOT NULL COMMENT '原价', - `tax_price` decimal(16, 2) NOT NULL COMMENT '现价', - `discount_rate` decimal(16, 2) NOT NULL COMMENT '折扣率（%）', - `is_gift` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否赠品', - `tax_rate` decimal(16, 2) NOT NULL COMMENT '税率（%）', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `ori_price` decimal(16,2) NOT NULL COMMENT '原价', + `tax_price` decimal(16,2) NOT NULL COMMENT '现价', + `discount_rate` decimal(16,2) NOT NULL COMMENT '折扣率（%）', + `is_gift` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否赠品', + `tax_rate` decimal(16,2) NOT NULL COMMENT '税率（%）', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `settle_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '结算状态', - `out_sheet_detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '出库单明细ID', + `settle_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '结算状态', + `out_sheet_detail_id` varchar(32) DEFAULT NULL COMMENT '出库单明细ID', PRIMARY KEY (`id`) USING BTREE, - INDEX `return_id`(`return_id`) USING BTREE, - INDEX `out_sheet_detail_id`(`out_sheet_detail_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '销售退单明细' ROW_FORMAT = DYNAMIC; + KEY `return_id` (`return_id`) USING BTREE, + KEY `out_sheet_detail_id` (`out_sheet_detail_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='销售退单明细'; -- ---------------------------- -- Records of tbl_sale_return_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sc_transfer_order -- ---------------------------- DROP TABLE IF EXISTS `tbl_sc_transfer_order`; -CREATE TABLE `tbl_sc_transfer_order` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单号', - `source_sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '转出仓库ID', - `target_sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '转入仓库ID', - `total_num` int(11) NOT NULL DEFAULT 0 COMMENT '调拨数量', - `total_amount` decimal(24, 2) NOT NULL DEFAULT 0.00 COMMENT '调拨成本金额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_sc_transfer_order` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '单号', + `source_sc_id` varchar(32) NOT NULL COMMENT '转出仓库ID', + `target_sc_id` varchar(32) NOT NULL COMMENT '转入仓库ID', + `total_num` int(11) NOT NULL DEFAULT '0' COMMENT '调拨数量', + `total_amount` decimal(24,2) NOT NULL DEFAULT '0.00' COMMENT '调拨成本金额', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', `status` tinyint(3) NOT NULL COMMENT '状态', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `source_sc_id`(`source_sc_id`) USING BTREE, - INDEX `target_sc_id`(`target_sc_id`) USING BTREE, - INDEX `create_time`(`create_time`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库调拨单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `source_sc_id` (`source_sc_id`) USING BTREE, + KEY `target_sc_id` (`target_sc_id`) USING BTREE, + KEY `create_time` (`create_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='仓库调拨单'; -- ---------------------------- -- Records of tbl_sc_transfer_order -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sc_transfer_order_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_sc_transfer_order_detail`; -CREATE TABLE `tbl_sc_transfer_order_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '调拨单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_sc_transfer_order_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '调拨单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `transfer_num` int(11) NOT NULL COMMENT '调拨数量', - `tax_price` decimal(16, 2) NULL DEFAULT NULL COMMENT '成本价', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `tax_price` decimal(16,2) DEFAULT NULL COMMENT '成本价', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序编号', - `receive_num` int(11) NOT NULL DEFAULT 0 COMMENT '已收货数量', + `receive_num` int(11) NOT NULL DEFAULT '0' COMMENT '已收货数量', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`) USING BTREE, - INDEX `product_id`(`product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库调拨单明细' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`) USING BTREE, + KEY `product_id` (`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='仓库调拨单明细'; -- ---------------------------- -- Records of tbl_sc_transfer_order_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_sc_transfer_order_detail_receive -- ---------------------------- DROP TABLE IF EXISTS `tbl_sc_transfer_order_detail_receive`; -CREATE TABLE `tbl_sc_transfer_order_detail_receive` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `order_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '调拨单ID', - `detail_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '明细ID', +CREATE TABLE `tbl_sc_transfer_order_detail_receive` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `order_id` varchar(32) NOT NULL COMMENT '调拨单ID', + `detail_id` varchar(32) NOT NULL COMMENT '明细ID', `receive_num` int(11) NOT NULL COMMENT '收货数量', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `order_id`(`order_id`, `detail_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '仓库调拨单收货明细' ROW_FORMAT = DYNAMIC; + KEY `order_id` (`order_id`,`detail_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='仓库调拨单收货明细'; -- ---------------------------- -- Records of tbl_sc_transfer_order_detail_receive -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_shop -- ---------------------------- DROP TABLE IF EXISTS `tbl_shop`; -CREATE TABLE `tbl_shop` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `dept_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门ID', - `lng` decimal(16, 6) NULL DEFAULT NULL COMMENT '经度', - `lat` decimal(16, 6) NULL DEFAULT NULL COMMENT '纬度', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态 1-在用 0停用', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', +CREATE TABLE `tbl_shop` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', + `dept_id` varchar(32) DEFAULT NULL COMMENT '所属部门ID', + `lng` decimal(16,6) DEFAULT NULL COMMENT '经度', + `lat` decimal(16,6) DEFAULT NULL COMMENT '纬度', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 1-在用 0停用', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '门店' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='门店'; -- ---------------------------- -- Records of tbl_shop -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_stock_adjust_reason -- ---------------------------- DROP TABLE IF EXISTS `tbl_stock_adjust_reason`; -CREATE TABLE `tbl_stock_adjust_reason` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编号', - `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', +CREATE TABLE `tbl_stock_adjust_reason` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(20) NOT NULL COMMENT '编号', + `name` varchar(20) NOT NULL COMMENT '名称', `available` tinyint(1) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) NOT NULL DEFAULT '' COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存调整原因' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存调整原因'; -- ---------------------------- -- Records of tbl_stock_adjust_reason -- ---------------------------- -INSERT INTO `tbl_stock_adjust_reason` VALUES ('1', '001', '初始化数据', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); -INSERT INTO `tbl_stock_adjust_reason` VALUES ('2', '002', '损溢', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); -INSERT INTO `tbl_stock_adjust_reason` VALUES ('3', '003', '其他', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); +BEGIN; +INSERT INTO `tbl_stock_adjust_reason` (`id`, `code`, `name`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1', '001', '初始化数据', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); +INSERT INTO `tbl_stock_adjust_reason` (`id`, `code`, `name`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('2', '002', '损溢', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); +INSERT INTO `tbl_stock_adjust_reason` (`id`, `code`, `name`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3', '003', '其他', 1, '系统内置', '系统管理员', '1', '2023-04-18 14:04:34', '系统管理员', '1', '2023-04-18 14:04:53'); +COMMIT; -- ---------------------------- -- Table structure for tbl_stock_adjust_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_stock_adjust_sheet`; -CREATE TABLE `tbl_stock_adjust_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', +CREATE TABLE `tbl_stock_adjust_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '业务单据号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', `biz_type` tinyint(3) NOT NULL COMMENT '业务类型', - `reason_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '调整原因ID', + `reason_id` varchar(32) NOT NULL COMMENT '调整原因ID', `status` tinyint(3) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存调整单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存调整单'; -- ---------------------------- -- Records of tbl_stock_adjust_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_stock_adjust_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_stock_adjust_sheet_detail`; -CREATE TABLE `tbl_stock_adjust_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_stock_adjust_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '单据ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `stock_num` int(11) NOT NULL COMMENT '调整库存数量', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存调整单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存调整单明细'; -- ---------------------------- -- Records of tbl_stock_adjust_sheet_detail -- ---------------------------- - --- ---------------------------- --- Table structure for tbl_stock_cost_adjust_sheet --- ---------------------------- -DROP TABLE IF EXISTS `tbl_stock_cost_adjust_sheet`; -CREATE TABLE `tbl_stock_cost_adjust_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', - `product_num` int(11) NOT NULL COMMENT '调价品种数', - `diff_amount` decimal(24, 2) NOT NULL COMMENT '库存调价差额', - `status` tinyint(3) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', - `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存成本调整单' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of tbl_stock_cost_adjust_sheet --- ---------------------------- - --- ---------------------------- --- Table structure for tbl_stock_cost_adjust_sheet_detail --- ---------------------------- -DROP TABLE IF EXISTS `tbl_stock_cost_adjust_sheet_detail`; -CREATE TABLE `tbl_stock_cost_adjust_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', - `stock_num` int(11) NOT NULL COMMENT '库存数量', - `purchase_price` decimal(16, 2) NOT NULL COMMENT '档案采购价', - `ori_price` decimal(16, 2) NOT NULL COMMENT '调整前成本价', - `price` decimal(16, 2) NOT NULL COMMENT '调整后成本价', - `diff_amount` decimal(24, 2) NOT NULL COMMENT '库存调价差额', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `order_no` int(11) NOT NULL COMMENT '排序', - PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存成本调整单明细' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of tbl_stock_cost_adjust_sheet_detail --- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_take_stock_config -- ---------------------------- DROP TABLE IF EXISTS `tbl_take_stock_config`; -CREATE TABLE `tbl_take_stock_config` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `show_product` tinyint(1) NOT NULL DEFAULT 0 COMMENT '库存盘点单关联盘点任务后，是否显示盘点任务中的商品数据', - `show_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '库存盘点单是否显示盘点任务创建时商品的系统库存数量', - `auto_change_stock` tinyint(1) NOT NULL DEFAULT 0 COMMENT '盘点差异生成时是否自动调整盘点任务中商品的系统库存数量', - `allow_change_num` tinyint(1) NOT NULL DEFAULT 0 COMMENT '盘点差异单中的盘点数量是否允许手动修改', - `cancel_hours` int(11) NOT NULL DEFAULT 24 COMMENT '盘点任务创建后多少小时内内未完成，则自动作废', +CREATE TABLE `tbl_take_stock_config` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `show_product` tinyint(1) NOT NULL DEFAULT '0' COMMENT '库存盘点单关联盘点任务后，是否显示盘点任务中的商品数据', + `show_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '库存盘点单是否显示盘点任务创建时商品的系统库存数量', + `auto_change_stock` tinyint(1) NOT NULL DEFAULT '0' COMMENT '盘点差异生成时是否自动调整盘点任务中商品的系统库存数量', + `allow_change_num` tinyint(1) NOT NULL DEFAULT '0' COMMENT '盘点差异单中的盘点数量是否允许手动修改', + `cancel_hours` int(11) NOT NULL DEFAULT '24' COMMENT '盘点任务创建后多少小时内内未完成，则自动作废', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点参数设置' ROW_FORMAT = DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存盘点参数设置'; -- ---------------------------- -- Records of tbl_take_stock_config -- ---------------------------- -INSERT INTO `tbl_take_stock_config` VALUES ('1', 1, 1, 1, 1, 168); +BEGIN; +INSERT INTO `tbl_take_stock_config` (`id`, `show_product`, `show_stock`, `auto_change_stock`, `allow_change_num`, `cancel_hours`) VALUES ('1', 1, 1, 1, 1, 168); +COMMIT; -- ---------------------------- -- Table structure for tbl_take_stock_plan -- ---------------------------- DROP TABLE IF EXISTS `tbl_take_stock_plan`; -CREATE TABLE `tbl_take_stock_plan` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', +CREATE TABLE `tbl_take_stock_plan` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '业务单据号', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', `take_type` tinyint(3) NOT NULL COMMENT '盘点类别', - `biz_id` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '业务ID', - `take_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '盘点状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `biz_id` longtext COMMENT '业务ID', + `take_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '盘点状态', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点任务' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存盘点任务'; -- ---------------------------- -- Records of tbl_take_stock_plan -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_take_stock_plan_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_take_stock_plan_detail`; -CREATE TABLE `tbl_take_stock_plan_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `plan_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '盘点任务ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_take_stock_plan_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `plan_id` varchar(32) NOT NULL COMMENT '盘点任务ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `stock_num` int(11) NOT NULL COMMENT '初始库存数量', - `ori_take_num` int(11) NULL DEFAULT NULL COMMENT '盘点数量', - `take_num` int(11) NULL DEFAULT NULL COMMENT '修改后的盘点数量', - `total_out_num` int(11) NOT NULL DEFAULT 0 COMMENT '出项数量', - `total_in_num` int(11) NOT NULL DEFAULT 0 COMMENT '入项数量', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `order_no` int(11) NOT NULL DEFAULT 0 COMMENT '排序', + `ori_take_num` int(11) DEFAULT NULL COMMENT '盘点数量', + `take_num` int(11) DEFAULT NULL COMMENT '修改后的盘点数量', + `total_out_num` int(11) NOT NULL DEFAULT '0' COMMENT '出项数量', + `total_in_num` int(11) NOT NULL DEFAULT '0' COMMENT '入项数量', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `plan_id`(`plan_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点任务明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `plan_id` (`plan_id`,`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存盘点任务明细'; -- ---------------------------- -- Records of tbl_take_stock_plan_detail -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_take_stock_sheet -- ---------------------------- DROP TABLE IF EXISTS `tbl_take_stock_sheet`; -CREATE TABLE `tbl_take_stock_sheet` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务单据号', - `plan_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '盘点任务ID', - `pre_sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预先盘点单ID', - `sc_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '仓库ID', +CREATE TABLE `tbl_take_stock_sheet` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `code` varchar(32) NOT NULL COMMENT '业务单据号', + `plan_id` varchar(32) NOT NULL COMMENT '盘点任务ID', + `pre_sheet_id` varchar(32) DEFAULT NULL COMMENT '预先盘点单ID', + `sc_id` varchar(32) NOT NULL COMMENT '仓库ID', `status` tinyint(3) NOT NULL COMMENT '状态', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人', - `create_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人ID', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', `create_time` datetime NOT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人', - `update_by_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '修改人ID', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', `update_time` datetime NOT NULL COMMENT '修改时间', - `approve_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', - `approve_time` datetime NULL DEFAULT NULL COMMENT '审核时间', - `refuse_reason` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因', + `approve_by` varchar(32) DEFAULT NULL COMMENT '审核人', + `approve_time` datetime DEFAULT NULL COMMENT '审核时间', + `refuse_reason` varchar(200) DEFAULT NULL COMMENT '拒绝原因', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `code`(`code`) USING BTREE, - INDEX `plan_id`(`plan_id`) USING BTREE, - INDEX `sc_id`(`sc_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `code` (`code`) USING BTREE, + KEY `plan_id` (`plan_id`) USING BTREE, + KEY `sc_id` (`sc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存盘点单'; -- ---------------------------- -- Records of tbl_take_stock_sheet -- ---------------------------- +BEGIN; +COMMIT; -- ---------------------------- -- Table structure for tbl_take_stock_sheet_detail -- ---------------------------- DROP TABLE IF EXISTS `tbl_take_stock_sheet_detail`; -CREATE TABLE `tbl_take_stock_sheet_detail` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', - `sheet_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '盘点单ID', - `product_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品ID', +CREATE TABLE `tbl_take_stock_sheet_detail` ( + `id` varchar(32) NOT NULL COMMENT 'ID', + `sheet_id` varchar(32) NOT NULL COMMENT '盘点单ID', + `product_id` varchar(32) NOT NULL COMMENT '商品ID', `take_num` int(11) NOT NULL COMMENT '盘点数量', - `description` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `description` varchar(200) DEFAULT NULL COMMENT '备注', `order_no` int(11) NOT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `sheet_id`(`sheet_id`, `product_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '库存盘点单明细' ROW_FORMAT = DYNAMIC; + UNIQUE KEY `sheet_id` (`sheet_id`,`product_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='库存盘点单明细'; -- ---------------------------- -- Records of tbl_take_stock_sheet_detail -- ---------------------------- +BEGIN; +COMMIT; -SET FOREIGN_KEY_CHECKS = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/platform/v1.5__update_function.sql b/xingyun-api/src/main/resources/db/migration/platform/v1.5__update_function.sql new file mode 100644 index 0000000000000000000000000000000000000000..27222b3593bb24f69d97f4321754ef75fcc6fdf5 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/platform/v1.5__update_function.sql @@ -0,0 +1 @@ +UPDATE sys_module t SET t.description = '商品库存调整。' WHERE t.id = 10; \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.0__init.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.0__init.sql index 4250d19003b18c43b50ff2df0e06bef83c3f0a0a..0ba0b8f80ddb6e089938ea444d722f6b6be1573b 100644 --- a/xingyun-api/src/main/resources/db/migration/tenant/V1.0__init.sql +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.0__init.sql @@ -9,7 +9,7 @@ CREATE TABLE `base_data_customer` ( `id` varchar(32) NOT NULL COMMENT 'ID', `code` varchar(20) NOT NULL COMMENT '编号', `name` varchar(20) NOT NULL COMMENT '名称', - `mnemonic_code` varchar(20) NOT NULL COMMENT '助记码', + `mnemonic_code` varchar(20) NOT NULL COMMENT '简码', `contact` varchar(100) DEFAULT NULL COMMENT '联系人', `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', @@ -88,7 +88,7 @@ CREATE TABLE `base_data_product` ( `name` varchar(100) NOT NULL COMMENT '名称', `short_name` varchar(100) DEFAULT NULL COMMENT '简称', `sku_code` varchar(100) NOT NULL COMMENT 'SKU', - `external_code` varchar(100) DEFAULT NULL COMMENT '外部编号', + `external_code` varchar(100) DEFAULT NULL COMMENT '简码', `category_id` varchar(32) NOT NULL COMMENT '类目ID', `brand_id` varchar(32) NOT NULL COMMENT '品牌ID', `tax_rate` decimal(16,2) NOT NULL COMMENT '进项税率（%）', @@ -351,7 +351,7 @@ CREATE TABLE `base_data_supplier` ( `id` varchar(32) NOT NULL COMMENT 'ID', `code` varchar(20) NOT NULL COMMENT '编号', `name` varchar(20) NOT NULL COMMENT '名称', - `mnemonic_code` varchar(20) NOT NULL COMMENT '助记码', + `mnemonic_code` varchar(20) NOT NULL COMMENT '简码', `contact` varchar(100) DEFAULT NULL COMMENT '联系人', `telephone` varchar(20) DEFAULT NULL COMMENT '联系电话', `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.10__generate_code_rule.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.10__generate_code_rule.sql new file mode 100644 index 0000000000000000000000000000000000000000..25bdd697266d880b06a618a292be0159d7dcf4af --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.10__generate_code_rule.sql @@ -0,0 +1,56 @@ +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000013', '1000013', 'SysGenerateCode', '编号规则', NULL, 0, '/system/generate-code/index', NULL, '1000', '2', '/generate-code', 0, 1, 0, 'system:generate-code:manage', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +-- ---------------------------- +-- Table structure for sys_generate_code +-- ---------------------------- +DROP TABLE IF EXISTS `sys_generate_code`; +CREATE TABLE `sys_generate_code` ( + `id` int(11) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `config_str` longtext NOT NULL COMMENT '配置信息（JSONArray）', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- ---------------------------- +-- Records of sys_generate_code +-- ---------------------------- +BEGIN; +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (1, '用户编号', '[{\"type\":6,\"val\":\"R\"},{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"58aabb1d160430444158d82e4c86cb9c7f2a\",\"len\":\"5\",\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (200, '采购订单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"37366f903834c842d5e8144bd707bdb77e35\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (201, '采购收货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"12099be638c90d466b2a4af5465ed632459f\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (202, '采购退单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"60fdc467f35db94c8569f6ed68d103ce5452\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (203, '销售订单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d141ddad1cea5344ebe85ac6d3c6550a9d5b\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (204, '销售出库单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"2bec018f14b3d647b9e8641a408dcecf58bc\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (205, '销售退货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"240604dc9024834d9d29abf86dd6bf7f3989\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (206, '零售出库单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"60ecbed8c835454552f8c177c69c155bdaf8\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (207, '零售退货单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"8307f839bd2e24426de87884fc034fe8d546\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (208, '预先盘点单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"5142a4fc6392764d35bb852e9dcfe544a482\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (209, '盘点任务号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"e0937a56dc47a6437c1840195ab26a454db6\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (210, '盘点单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d5a2827d3b2f6844aae858e6cb62449a3283\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (212, '库存调整单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"10787084f2177b430709b260f42085ce14e9\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (213, '仓库调拨单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"3b0668d95c93234ca65a6afa6f5c333819ea\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (214, '物流单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"f693245a4a05ab4e7f19362e45e09da59d74\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (300, '供应商对账单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"89398b781627df40f6fbfdab81fc7ab83c05\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (301, '供应商费用单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"286289a735b3f24859a91db603b14e48df4e\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (302, '供应商付款单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"f7ed22483ab83a435218cd0af3b6102fa308\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (303, '供应商结算单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"741524aed5dbd1452acbe05bf63a35d8bbeb\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (304, '客户对账单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"d8bddcd37139d24bb12ae66b0f6732eecef9\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (305, '客户费用单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"37f9d9a53699d042088918afe08d7de15d82\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (306, '客户预付款单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"9a2cb171fd93464fb76928b35f77d0045b32\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +INSERT INTO `sys_generate_code` (`id`, `name`, `config_str`) VALUES (307, '客户结算单号', '[{\"type\":1,\"pattern\":\"yyyyMMdd\"},{\"type\":3,\"key\":\"e63f16fc2acf984c3e9bef378e6ea4546204\",\"len\":10,\"step\":1,\"expireSeconds\":86400}]'); +COMMIT; + +UPDATE `sys_menu` SET `code` = '2001001', `name` = 'ProductCategory', `title` = '商品分类', `icon` = NULL, `component_type` = 0, `component` = '/base-data/product/category/index', `request_param` = NULL, `parent_id` = '2001', `sys_module_id` = '4', `path` = '/category', `no_cache` = 0, `display` = 1, `hidden` = 0, `permission` = 'base-data:product:category:query', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-07-05 21:59:35', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-05 21:59:36' WHERE `id` = '2001001'; +UPDATE `sys_menu` SET `code` = '2001001001', `name` = '', `title` = '新增分类', `icon` = NULL, `component_type` = 0, `component` = '', `request_param` = NULL, `parent_id` = '2001001', `sys_module_id` = '4', `path` = '', `no_cache` = 0, `display` = 2, `hidden` = 0, `permission` = 'base-data:product:category:add', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-05-12 22:50:27', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-04 00:34:23' WHERE `id` = '2001001001'; +UPDATE `sys_menu` SET `code` = '2001001002', `name` = '', `title` = '修改分类', `icon` = NULL, `component_type` = 0, `component` = '', `request_param` = NULL, `parent_id` = '2001001', `sys_module_id` = '4', `path` = '', `no_cache` = 0, `display` = 2, `hidden` = 0, `permission` = 'base-data:product:category:modify', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-05-12 23:23:33', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-04 00:34:23' WHERE `id` = '2001001002'; +UPDATE `sys_menu` SET `code` = '2001001003', `name` = '', `title` = '导入分类', `icon` = NULL, `component_type` = 0, `component` = '', `request_param` = NULL, `parent_id` = '2001001', `sys_module_id` = '4', `path` = '', `no_cache` = 0, `display` = 2, `hidden` = 0, `permission` = 'base-data:product:category:import', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-05-12 23:23:33', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-04 00:34:23' WHERE `id` = '2001001003'; +UPDATE `sys_menu` SET `title` = '库存调整' WHERE `id` = '3000005003'; +UPDATE `sys_menu` SET `code` = '3000005002001', `name` = '', `title` = '新增库存调整原因', `icon` = NULL, `component_type` = 0, `component` = '', `request_param` = NULL, `parent_id` = '3000005002', `sys_module_id` = '10', `path` = '', `no_cache` = 0, `display` = 2, `hidden` = 0, `permission` = 'stock:adjust:reason:add', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-05-12 22:50:27', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-04 00:34:23' WHERE `id` = '3000005002001'; +UPDATE `sys_menu` SET `code` = '3000005002002', `name` = '', `title` = '修改库存调整原因', `icon` = NULL, `component_type` = 0, `component` = '', `request_param` = NULL, `parent_id` = '3000005002', `sys_module_id` = '10', `path` = '', `no_cache` = 0, `display` = 2, `hidden` = 0, `permission` = 'stock:adjust:reason:modify', `is_special` = 1, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2021-05-12 22:50:27', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2021-07-04 00:34:23' WHERE `id` = '3000005002002'; + +DELETE FROM `sys_menu` WHERE id IN ('3000005001', '3000005001001', '3000005001002', '3000005001003', '3000005001004', '3000005001005', '1000003', '1000003001', '1000003002'); +DROP TABLE `tbl_stock_cost_adjust_sheet`; +DROP TABLE `tbl_stock_cost_adjust_sheet_detail`; +DROP TABLE sys_position; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.11__sys_notify_group.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.11__sys_notify_group.sql new file mode 100644 index 0000000000000000000000000000000000000000..4f2d96722856f9fdbba340d589abb60bb1217b23 --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.11__sys_notify_group.sql @@ -0,0 +1,110 @@ +CREATE TABLE `sys_mail_message` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `title` varchar(100) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `mail` varchar(100) NOT NULL COMMENT '邮箱', + `biz_key` varchar(20) NOT NULL COMMENT '业务键', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `send_status` tinyint(3) NOT NULL DEFAULT '0' COMMENT '发送状态', + PRIMARY KEY (`id`), + KEY `mail` (`mail`), + KEY `biz_key` (`biz_key`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='邮件消息'; + +CREATE TABLE `sys_notify_group` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `name` varchar(20) NOT NULL COMMENT '名称', + `receiver_type` tinyint(3) NOT NULL COMMENT '接收者类型', + `message_type` longtext NOT NULL COMMENT '消息类型', + `description` varchar(200) DEFAULT NULL COMMENT '备注', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `available` tinyint(1) NOT NULL COMMENT '状态', + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息通知组'; + +CREATE TABLE `sys_notify_group_receiver` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `group_id` varchar(20) NOT NULL COMMENT '消息通知组ID', + `receiver_id` varchar(20) NOT NULL COMMENT '接收者ID', + PRIMARY KEY (`id`), + UNIQUE KEY `group_id` (`group_id`,`receiver_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息通知组-接收者关系表'; + +CREATE TABLE `sys_site_message` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `title` varchar(100) NOT NULL COMMENT '标题', + `content` longtext NOT NULL COMMENT '内容', + `receiver_id` varchar(20) NOT NULL COMMENT '接收人ID', + `biz_key` varchar(20) NOT NULL COMMENT '业务键', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `readed` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已读', + `read_time` datetime DEFAULT NULL COMMENT '已读时间', + PRIMARY KEY (`id`), + KEY `biz_key` (`biz_key`), + KEY `receiver_id` (`receiver_id`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内信'; + +CREATE TABLE `tbl_product_stock_warning` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `sc_id` varchar(20) NOT NULL COMMENT '仓库ID', + `product_id` varchar(20) NOT NULL COMMENT '商品ID', + `max_limit` int(11) NOT NULL DEFAULT '0' COMMENT '预警上限', + `min_limit` int(11) NOT NULL DEFAULT '0' COMMENT '预警下限', + `create_by` varchar(32) NOT NULL COMMENT '创建人', + `create_by_id` varchar(32) NOT NULL COMMENT '创建人ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_by` varchar(32) NOT NULL COMMENT '修改人', + `update_by_id` varchar(32) NOT NULL COMMENT '修改人ID', + `update_time` datetime NOT NULL COMMENT '修改时间', + `available` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `sc_id` (`sc_id`,`product_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存预警'; + +CREATE TABLE `tbl_product_stock_warning_notify` ( + `id` varchar(20) NOT NULL COMMENT 'ID', + `notify_group_id` varchar(20) NOT NULL COMMENT '通知组ID', + PRIMARY KEY (`id`), + UNIQUE KEY `notify_group_id` (`notify_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存预警通知组'; + +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014', '1000014', 'SysNotifyGroup', '消息通知组', NULL, 0, '/system/notify-group/index', NULL, '1000', '2', '/notify-group', 0, 1, 0, 'system:notify-group:query', 1, 1, '', '系统管理员', '1', '2021-05-08 18:37:01', '系统管理员', '1', '2021-12-09 17:54:42'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014001', '1000014001', '', '新增消息通知组', NULL, 0, '', NULL, '1000014', '8', '', 0, 2, 0, 'system:notify-group:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1000014002', '1000014002', '', '修改消息通知组', NULL, 0, '', NULL, '1000014', '8', '', 0, 2, 0, 'system:notify-group:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007', '3000007', 'StockWarning', '库存预警', NULL, 0, '/sc/stock/warning/index', NULL, '3000', '8', '/warning', 0, 1, 0, 'stock:warning:query', 1, 1, '', '系统管理员', '1', '2021-07-05 21:59:35', '系统管理员', '1', '2021-07-05 21:59:36'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007001', '3000007001', '', '新增库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:add', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007002', '3000007002', '', '修改库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:modify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007003', '3000007003', '', '删除库存预警', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:delete', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('3000007004', '3000007004', '', '设置消息通知组', NULL, 0, '', NULL, '3000007', '8', '', 0, 2, 0, 'stock:warning:notify', 1, 1, '', '系统管理员', '1', '2021-05-12 22:50:27', '系统管理员', '1', '2021-07-04 00:34:23'); + +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002', '1002', 'MsgCenter', '消息中心', 'ant-design:message-outlined', NULL, '', NULL, NULL, '2', '/msg-center', 0, 0, 0, '', 1, 1, '', '系统管理员', '1', '2021-07-04 00:22:05', '系统管理员', '1', '2021-07-04 00:34:23'); +UPDATE `sys_menu` SET `parent_id` = '1002' WHERE `id` = '1000009'; +UPDATE `sys_menu` SET `code` = '1002001' WHERE `id` = '1000009'; +UPDATE `sys_menu` SET `permission` = '' WHERE `id` = '1000009'; +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002002', '1002002', 'SysNotify', '站内信', NULL, 0, '/system/notify/index', NULL, '1002', '2', '/system/notify', 0, 1, 0, '', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +UPDATE `sys_menu` SET `parent_id` = '1002' WHERE `id` = '1000008'; +UPDATE `sys_menu` SET `title` = '我的系统通知' WHERE `id` = '1000009'; +UPDATE `sys_menu` SET `title` = '我的站内信' WHERE `id` = '1002002'; +UPDATE `sys_menu` SET `code` = '1002002', `name` = 'SiteMessage', `title` = '我的站内信', `icon` = NULL, `component_type` = 0, `component` = '/system/site-message/index', `request_param` = NULL, `parent_id` = '1002', `sys_module_id` = '2', `path` = '/system/site-message', `no_cache` = 0, `display` = 1, `hidden` = 0, `permission` = '', `is_special` = 0, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2022-08-18 14:31:12', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2022-08-18 14:31:12' WHERE `id` = '1002002'; +UPDATE `sys_menu` SET `code` = '1002001', `name` = 'MySysNotice', `title` = '我的系统通知', `icon` = NULL, `component_type` = 0, `component` = '/system/notice/index', `request_param` = NULL, `parent_id` = '1002', `sys_module_id` = '2', `path` = '/system/notice/my', `no_cache` = 0, `display` = 1, `hidden` = 0, `permission` = '', `is_special` = 0, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2022-08-18 14:31:12', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2022-08-18 14:31:12' WHERE `id` = '1000009'; +UPDATE `sys_menu` SET `code` = '1002002', `name` = 'MySiteMessage', `title` = '我的站内信', `icon` = NULL, `component_type` = 0, `component` = '/system/site-message/index', `request_param` = NULL, `parent_id` = '1002', `sys_module_id` = '2', `path` = '/system/site-message/my', `no_cache` = 0, `display` = 1, `hidden` = 0, `permission` = '', `is_special` = 0, `available` = 1, `description` = '', `create_by` = '系统管理员', `create_by_id` = '1', `create_time` = '2022-08-18 14:31:12', `update_by` = '系统管理员', `update_by_id` = '1', `update_time` = '2022-08-18 14:31:12' WHERE `id` = '1002002'; +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002001', '1002001', 'SiteMessage', '站内信', NULL, 0, '/system/site-message/manage', NULL, '1002', '2', '/system/site-message/manage', 0, 1, 0, 'system:site-message:manage', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); +INSERT INTO `sys_menu` (`id`, `code`, `name`, `title`, `icon`, `component_type`, `component`, `request_param`, `parent_id`, `sys_module_id`, `path`, `no_cache`, `display`, `hidden`, `permission`, `is_special`, `available`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES ('1002003', '1002003', 'MailMessage', '邮件消息', NULL, 0, '/system/mail-message/index', NULL, '1002', '2', '/system/mail-message', 0, 1, 0, 'system:mail-message:manage', 0, 1, '', '系统管理员', '1', '2022-08-18 14:31:12', '系统管理员', '1', '2022-08-18 14:31:12'); \ No newline at end of file diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.1__paytype.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.1__paytype.sql index aca2de3a8c87c0cd96babbabce50b790182c3100..a9f3ec344988bf3470138397c7ed9fcf475d8c57 100644 --- a/xingyun-api/src/main/resources/db/migration/tenant/V1.1__paytype.sql +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.1__paytype.sql @@ -410,7 +410,7 @@ INSERT INTO `sys_data_permission_model_detail` VALUES (1, '编号', 1, '0,1,2,3, INSERT INTO `sys_data_permission_model_detail` VALUES (2, '名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'name', NULL, NULL); INSERT INTO `sys_data_permission_model_detail` VALUES (3, '简称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'short_name', NULL, NULL); INSERT INTO `sys_data_permission_model_detail` VALUES (4, 'SKU', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'sku_code', NULL, NULL); -INSERT INTO `sys_data_permission_model_detail` VALUES (5, '外部编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'external_code', NULL, NULL); +INSERT INTO `sys_data_permission_model_detail` VALUES (5, '简码', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'product', 'external_code', NULL, NULL); INSERT INTO `sys_data_permission_model_detail` VALUES (6, '品类编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'code', NULL, NULL); INSERT INTO `sys_data_permission_model_detail` VALUES (7, '品类名称', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'category', 'name', NULL, NULL); INSERT INTO `sys_data_permission_model_detail` VALUES (8, '品牌编号', 1, '0,1,2,3,4,5,6,7,8,9,10', 0, 'brand', 'code', NULL, NULL); diff --git a/xingyun-api/src/main/resources/db/migration/tenant/V1.9__login_captcha_require.sql b/xingyun-api/src/main/resources/db/migration/tenant/V1.9__login_captcha_require.sql new file mode 100644 index 0000000000000000000000000000000000000000..5d4097eeb533a18991453e9e40dcc81f1429444b --- /dev/null +++ b/xingyun-api/src/main/resources/db/migration/tenant/V1.9__login_captcha_require.sql @@ -0,0 +1 @@ +INSERT INTO `sys_parameter` (`id`, `pm_key`, `pm_value`, `description`, `create_by`, `create_by_id`, `create_time`, `update_by`, `update_by_id`, `update_time`) VALUES (13, 'login-captcha.enabled', 'true', '登录时是否需要验证码，true：需要；false：不需要。', '系统管理员', '1', '2024-10-16 21:39:32', '系统管理员', '1', '2024-10-16 21:39:32'); \ No newline at end of file diff --git a/xingyun-basedata/pom.xml b/xingyun-basedata/pom.xml index 25fbfc1eb3e917a732b7c8377c7f6269a355c5fd..af19a3d1bd0bc390160a6e656e22a42650973b80 100644 --- a/xingyun-basedata/pom.xml +++ b/xingyun-basedata/pom.xml @@ -17,5 +17,9 @@ com.lframework xingyun-core + + com.lframework + xingyun-sys + diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/AddressSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/AddressSelectorBo.java index d96ad74cd5226e30cab066d33228e3abb461c014..cdc88c0e8dea965f5fc39ba4924d10e42fabceaa 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/AddressSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/AddressSelectorBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.address; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/GetAddressBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/GetAddressBo.java index e9fcbbafc36793df8bcd3015c5d41d84b013e98f..8c4eaf0448bf5b390806cc4781934ca32580b5f3 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/GetAddressBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/GetAddressBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.address; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/QueryAddressBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/QueryAddressBo.java index a4e0188311e1467b18c8cfc4ff882c70d2caac50..028231b51ad77b3d18d2db96250108453d9ebf2d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/QueryAddressBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/address/QueryAddressBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.address; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/GetCustomerBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/GetCustomerBo.java index cd6d2c84935f96e252994349290ffd945f85ff3d..b2c63f717fb1a22d337e95fc402136f4eac74248 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/GetCustomerBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/customer/GetCustomerBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.customer; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; @@ -34,9 +34,9 @@ public class GetCustomerBo extends BaseBo { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty("助记码") + @ApiModelProperty("简码") private String mnemonicCode; /** @@ -88,9 +88,9 @@ public class GetCustomerBo extends BaseBo { private String address; /** - * 结账方式 + * 结算方式 */ - @ApiModelProperty("结账方式") + @ApiModelProperty("结算方式") private Integer settleType; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/GetLogisticsCompanyBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/GetLogisticsCompanyBo.java index bdb896f50ff4cba0ea754fd33b5db866442e05f8..e4a30e0b7bb4b1e13548e72d952e2b6563710b55 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/GetLogisticsCompanyBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/logistics/company/GetLogisticsCompanyBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.logistics.company; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/GetMemberBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/GetMemberBo.java index 890397ac189f2b3060823bfb3732abf1c7725660..765026c3764a4cadf7ccb1544d8afff11510e980 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/GetMemberBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/member/GetMemberBo.java @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.service.shop.ShopService; -import com.lframework.xingyun.template.core.dto.UserDto; -import com.lframework.xingyun.template.core.service.UserService; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -130,8 +130,8 @@ public class GetMemberBo extends BaseBo { } if (!StringUtil.isBlank(dto.getGuiderId())) { - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto guider = userService.findById(dto.getGuiderId()); + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser guider = userService.findById(dto.getGuiderId()); this.guiderName = guider.getName(); } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/GetProductCategoryBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/GetProductCategoryBo.java index 567487371fac16b3d1f91609ee3cf57b341adc30..1a03eb0341d9a535a88d346046cd465930a9ffb8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/GetProductCategoryBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/category/GetProductCategoryBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.product.category; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.service.product.ProductCategoryService; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java index 0fd52d27d0b2b8ce22c72d1b44e56bd2fa23af9e..10dc422313ef1669062b21043b7aded5962a3474 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/GetProductBo.java @@ -4,7 +4,7 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.dto.product.ProductPropertyRelationDto; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; @@ -63,21 +63,21 @@ public class GetProductBo extends BaseBo { private String skuCode; /** - * 外部编号 + * 简码 */ - @ApiModelProperty("外部编号") + @ApiModelProperty("简码") private String externalCode; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private String categoryId; /** - * 类目名称 + * 分类名称 */ - @ApiModelProperty("类目名称") + @ApiModelProperty("分类名称") private String categoryName; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductSelectorBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductSelectorBo.java index 2ad4c61bbc9b555c149c728287fe3637de56fd25..35e784a112842216a4ec2ef651ddf9f40a94b74e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductSelectorBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/ProductSelectorBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.bo.product.info; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -39,21 +39,21 @@ public class ProductSelectorBo extends BaseBo { private String skuCode; /** - * 外部编号 + * 简码 */ - @ApiModelProperty("外部编号") + @ApiModelProperty("简码") private String externalCode; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private String categoryId; /** - * 类目名称 + * 分类名称 */ - @ApiModelProperty("类目名称") + @ApiModelProperty("分类名称") private String categoryName; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java index c755cfe3c3ac967a7137975995549fb41426f24a..e60d9a8dc2dd13578fff1089d500716e8e3cdf1b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/info/QueryProductBo.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.entity.ProductCategory; @@ -48,9 +48,9 @@ public class QueryProductBo extends BaseBo { private String skuCode; /** - * 类目名称 + * 分类名称 */ - @ApiModelProperty("类目名称") + @ApiModelProperty("分类名称") private String categoryName; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/GetProductPropertyBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/GetProductPropertyBo.java index 24e213b3c5e8d8294f967d68430a63d639a29801..aa32baf6416f41653459b8ed34ebb156585bb92a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/GetProductPropertyBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/product/property/GetProductPropertyBo.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.basedata.bo.product.property; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.ProductCategoryProperty; import com.lframework.xingyun.basedata.entity.ProductProperty; import com.lframework.xingyun.basedata.enums.PropertyType; @@ -57,9 +57,9 @@ public class GetProductPropertyBo extends BaseBo { private Integer propertyType; /** - * 类目 + * 分类 */ - @ApiModelProperty("类目") + @ApiModelProperty("分类") private List categories; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/GetShopBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/GetShopBo.java index 256466bd53471f3b1e6f279b41f45eacd093bd51..bf0f1d1a4aa77ef1ba0835531acfef18f64bff44 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/GetShopBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/GetShopBo.java @@ -2,10 +2,10 @@ package com.lframework.xingyun.basedata.bo.shop; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Shop; -import com.lframework.xingyun.template.core.dto.DeptDto; -import com.lframework.xingyun.template.core.service.DeptService; +import com.lframework.xingyun.template.inner.entity.SysDept; +import com.lframework.xingyun.template.inner.service.system.SysDeptService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -86,9 +86,9 @@ public class GetShopBo extends BaseBo { @Override protected void afterInit(Shop dto) { if (!StringUtil.isBlank(dto.getDeptId())) { - DeptService deptService = ApplicationUtil.getBean(DeptService.class); + SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class); - DeptDto dept = deptService.findById(dto.getDeptId()); + SysDept dept = sysDeptService.findById(dto.getDeptId()); this.deptName = dept.getName(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/QueryShopBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/QueryShopBo.java index a10f8dc55bbddde67077ba23e722470f78e2b231..9707778bd7173368236aa7b9a093c3a9a6770fa1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/QueryShopBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/shop/QueryShopBo.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Shop; -import com.lframework.xingyun.template.core.dto.DeptDto; -import com.lframework.xingyun.template.core.service.DeptService; +import com.lframework.xingyun.template.inner.entity.SysDept; +import com.lframework.xingyun.template.inner.service.system.SysDeptService; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; @@ -83,9 +83,9 @@ public class QueryShopBo extends BaseBo { @Override protected void afterInit(Shop dto) { if (!StringUtil.isBlank(dto.getDeptId())) { - DeptService deptService = ApplicationUtil.getBean(DeptService.class); + SysDeptService sysDeptService = ApplicationUtil.getBean(SysDeptService.class); - DeptDto dept = deptService.findById(dto.getDeptId()); + SysDept dept = sysDeptService.findById(dto.getDeptId()); this.deptName = dept.getName(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/GetStoreCenterBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/GetStoreCenterBo.java index 87557627646121be47bd812e5fa655521f3aa0ff..4dba9a227bb123c55aa0bd4d650eb3d1ee06092c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/GetStoreCenterBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/storecenter/GetStoreCenterBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.storecenter; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/GetSupplierBo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/GetSupplierBo.java index c6b56168c67a9e2477ed2a814ffbbcfb56ec76cd..57bd730f95890b69556ca5ba6fb38d14f6fd5f58 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/GetSupplierBo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/bo/supplier/GetSupplierBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.basedata.bo.supplier; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; @@ -34,9 +34,9 @@ public class GetSupplierBo extends BaseBo { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty("助记码") + @ApiModelProperty("简码") private String mnemonicCode; /** @@ -100,9 +100,9 @@ public class GetSupplierBo extends BaseBo { private Integer manageType; /** - * 结账方式 + * 结算方式 */ - @ApiModelProperty("结账方式") + @ApiModelProperty("结算方式") private Integer settleType; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/BaseDataSelectorController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/BaseDataSelectorController.java index b68b3c01de038a5a6a881297d1ba7523734a0f0d..80091b8682338856fd6ce3cc008d312cb25a68a8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/BaseDataSelectorController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/BaseDataSelectorController.java @@ -199,9 +199,9 @@ public class BaseDataSelectorController extends DefaultBaseController { } /** - * 类目 + * 分类 */ - @ApiOperation("类目") + @ApiOperation("分类") @GetMapping("/category") public InvokeResult> category( @Valid QueryProductCategorySelectorVo vo) { @@ -216,9 +216,9 @@ public class BaseDataSelectorController extends DefaultBaseController { } /** - * 加载类目 + * 加载分类 */ - @ApiOperation("加载类目") + @ApiOperation("加载分类") @PostMapping("/category/load") public InvokeResult> loadCustomList( @RequestBody(required = false) List ids) { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/CustomerController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/CustomerController.java index 31f561ae43b01d68bea4aeddd61ab7ef34d3d0fc..41d4274c8428d9a2268b1b4a8089d917718e116b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/CustomerController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/CustomerController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.customer.GetCustomerBo; import com.lframework.xingyun.basedata.bo.customer.QueryCustomerBo; import com.lframework.xingyun.basedata.entity.Customer; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -95,37 +94,33 @@ public class CustomerController extends DefaultBaseController { } /** - * 批量停用客户 + * 停用客户 */ - @ApiOperation("批量停用客户") + @ApiOperation("停用客户") @HasPermission({"base-data:customer:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的客户！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "客户ID不能为空！") String id) { - customerService.batchUnable(ids); + customerService.unable(id); - for (String id : ids) { - customerService.cleanCacheByKey(id); - } + customerService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用客户 + * 启用客户 */ - @ApiOperation("批量启用客户") + @ApiOperation("启用客户") @HasPermission({"base-data:customer:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的客户！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "客户ID不能为空！") String id) { - customerService.batchEnable(ids); + customerService.enable(id); - for (String id : ids) { - customerService.cleanCacheByKey(id); - } + customerService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/LogisticsCompanyController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/LogisticsCompanyController.java index 05d3ae54c6757f9e93688c883033446924a02c47..f45250670df70bcb1dd6ea48be8359967e8d0d5b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/LogisticsCompanyController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/LogisticsCompanyController.java @@ -2,12 +2,12 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.logistics.company.GetLogisticsCompanyBo; import com.lframework.xingyun.basedata.bo.logistics.company.QueryLogisticsCompanyBo; import com.lframework.xingyun.basedata.entity.LogisticsCompany; @@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -93,37 +92,33 @@ public class LogisticsCompanyController extends DefaultBaseController { } /** - * 批量停用物流公司 + * 停用物流公司 */ - @ApiOperation("批量停用物流公司") + @ApiOperation("停用物流公司") @HasPermission({"base-data:logistics-company:modify"}) - @PatchMapping("/unable/batch") + @PatchMapping("/unable") public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的物流公司！") @RequestBody List ids) { + @ApiParam(value = "ID", required = true) @NotEmpty(message = "物流公司ID不能为空！") String id) { - logisticsCompanyService.batchUnable(ids); + logisticsCompanyService.unable(id); - for (String id : ids) { - logisticsCompanyService.cleanCacheByKey(id); - } + logisticsCompanyService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用物流公司 + * 启用物流公司 */ - @ApiOperation("批量启用物流公司") + @ApiOperation("启用物流公司") @HasPermission({"base-data:logistics-company:modify"}) - @PatchMapping("/enable/batch") + @PatchMapping("/enable") public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的物流公司！") @RequestBody List ids) { + @ApiParam(value = "ID", required = true) @NotEmpty(message = "物流公司ID不能为空！") String id) { - logisticsCompanyService.batchEnable(ids); + logisticsCompanyService.enable(id); - for (String id : ids) { - logisticsCompanyService.cleanCacheByKey(id); - } + logisticsCompanyService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/MemberController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/MemberController.java index 39efc045ef510de0b93fa7c612b5667803ae8674..e9f736a2ddba3731d7f7530a3385edbbba792ba4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/MemberController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/MemberController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.member.GetMemberBo; import com.lframework.xingyun.basedata.bo.member.QueryMemberBo; import com.lframework.xingyun.basedata.entity.Member; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -93,37 +92,33 @@ public class MemberController extends DefaultBaseController { } /** - * 批量停用会员 + * 停用会员 */ - @ApiOperation("批量停用会员") + @ApiOperation("停用会员") @HasPermission({"base-data:member:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的会员！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "会员ID不能为空！") String id) { - memberService.batchUnable(ids); + memberService.unable(id); - for (String id : ids) { - memberService.cleanCacheByKey(id); - } + memberService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用会员 + * 启用会员 */ - @ApiOperation("批量启用会员") + @ApiOperation("启用会员") @HasPermission({"base-data:member:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的会员！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "会员ID不能为空！") String id) { - memberService.batchEnable(ids); + memberService.enable(id); - for (String id : ids) { - memberService.cleanCacheByKey(id); - } + memberService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductBrandController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductBrandController.java index 3e62db83aace5d8d80677c5d78a6e34fdba6d716..6f391b69af4f9fee3047da8c11ab0035dc64ab78 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductBrandController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductBrandController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.product.brand.GetProductBrandBo; import com.lframework.xingyun.basedata.bo.product.brand.QueryProductBrandBo; import com.lframework.xingyun.basedata.entity.ProductBrand; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -98,37 +97,33 @@ public class ProductBrandController extends DefaultBaseController { } /** - * 批量停用品牌 + * 停用品牌 */ - @ApiOperation("批量停用品牌") + @ApiOperation("停用品牌") @HasPermission({"base-data:product:brand:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的品牌！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "品牌ID不能为空！") String id) { - productBrandService.batchUnable(ids); + productBrandService.unable(id); - for (String id : ids) { - productBrandService.cleanCacheByKey(id); - } + productBrandService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用品牌 + * 启用品牌 */ - @ApiOperation("批量启用品牌") + @ApiOperation("启用品牌") @HasPermission({"base-data:product:brand:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的品牌！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "品牌ID不能为空！") String id) { - productBrandService.batchEnable(ids); + productBrandService.enable(id); - for (String id : ids) { - productBrandService.cleanCacheByKey(id); - } + productBrandService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductCategoryController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductCategoryController.java index e2e454d8fd8d9740611158ffe11858b4700f89c1..e250af8918fa857ee4c4a3339dd98435486790ec 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductCategoryController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductCategoryController.java @@ -2,9 +2,9 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.core.service.RecursionMappingService; +import com.lframework.xingyun.core.service.RecursionMappingService; import com.lframework.starter.web.annotations.security.HasPermission; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; @@ -34,17 +34,16 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; /** - * 类目管理 + * 分类管理 * * @author zmj */ -@Api(tags = "类目管理") +@Api(tags = "分类管理") @Validated @RestController @RequestMapping("/basedata/product/category") @@ -57,9 +56,9 @@ public class ProductCategoryController extends DefaultBaseController { private RecursionMappingService recursionMappingService; /** - * 类目列表 + * 分类列表 */ - @ApiOperation("类目列表") + @ApiOperation("分类列表") @HasPermission({"base-data:product:category:query", "base-data:product:category:add", "base-data:product:category:modify"}) @GetMapping("/query") @@ -77,9 +76,9 @@ public class ProductCategoryController extends DefaultBaseController { } /** - * 查询类目 + * 查询分类 */ - @ApiOperation("查询类目") + @ApiOperation("查询分类") @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) @HasPermission({"base-data:product:category:query", "base-data:product:category:add", "base-data:product:category:modify"}) @@ -88,7 +87,7 @@ public class ProductCategoryController extends DefaultBaseController { ProductCategory data = productCategoryService.findById(id); if (data == null) { - throw new DefaultClientException("类目不存在！"); + throw new DefaultClientException("分类不存在！"); } GetProductCategoryBo result = new GetProductCategoryBo(data); @@ -97,40 +96,40 @@ public class ProductCategoryController extends DefaultBaseController { } /** - * 批量停用类目 + * 停用分类 */ - @ApiOperation("批量停用类目") + @ApiOperation("停用分类") @HasPermission({"base-data:product:category:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的类目！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "分类ID不能为空！") String id) { + + productCategoryService.unable(id); + productCategoryService.cleanCacheByKey(id); - productCategoryService.batchUnable(ids); return InvokeResultBuilder.success(); } /** - * 批量启用类目 + * 启用分类 */ - @ApiOperation("批量启用类目") + @ApiOperation("启用分类") @HasPermission({"base-data:product:category:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的类目！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "分类ID不能为空！") String id) { - productCategoryService.batchEnable(ids); + productCategoryService.enable(id); - for (String id : ids) { - productCategoryService.cleanCacheByKey(id); - } + productCategoryService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 新增类目 + * 新增分类 */ - @ApiOperation("新增类目") + @ApiOperation("新增分类") @HasPermission({"base-data:product:category:add"}) @PostMapping public InvokeResult create(@Valid CreateProductCategoryVo vo) { @@ -141,9 +140,9 @@ public class ProductCategoryController extends DefaultBaseController { } /** - * 修改类目 + * 修改分类 */ - @ApiOperation("修改类目") + @ApiOperation("修改分类") @HasPermission({"base-data:product:category:modify"}) @PutMapping public InvokeResult update(@Valid UpdateProductCategoryVo vo) { @@ -184,7 +183,7 @@ public class ProductCategoryController extends DefaultBaseController { @HasPermission({"base-data:product:category:import"}) @GetMapping("/import/template") public void downloadImportTemplate() { - ExcelUtil.exportXls("类目导入模板", ProductCategoryImportModel.class); + ExcelUtil.exportXls("分类导入模板", ProductCategoryImportModel.class); } @ApiOperation("导入") diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyController.java index 5eb32d5ac44cfd0c2f9f1766fc6bd0591e61f09e..8778a0849b795c5461c48abdaefe3c08c2279087 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/ProductPropertyController.java @@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ThreadUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; -import com.lframework.starter.web.common.threads.DefaultRunnable; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.threads.DefaultRunnable; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.product.property.GetProductPropertyBo; import com.lframework.xingyun.basedata.bo.product.property.ProductPropertyModelorBo; import com.lframework.xingyun.basedata.bo.product.property.QueryProductPropertyBo; @@ -103,37 +103,33 @@ public class ProductPropertyController extends DefaultBaseController { } /** - * 批量停用属性 + * 停用属性 */ - @ApiOperation("批量停用属性") + @ApiOperation("停用属性") @HasPermission({"base-data:product:property:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的属性！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "属性ID不能为空！") String id) { - productPropertyService.batchUnable(ids); + productPropertyService.unable(id); - for (String id : ids) { - productPropertyService.cleanCacheByKey(id); - } + productPropertyService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用属性 + * 启用属性 */ - @ApiOperation("批量启用属性") + @ApiOperation("启用属性") @HasPermission({"base-data:product:property:modify"}) - @PatchMapping("/enable/batch") + @PatchMapping("/enable") public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的属性！") @RequestBody List ids) { + @ApiParam(value = "ID", required = true) @NotEmpty(message = "属性ID不能为空！") String id) { - productPropertyService.batchEnable(ids); + productPropertyService.enable(id); - for (String id : ids) { - productPropertyService.cleanCacheByKey(id); - } + productPropertyService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } @@ -183,10 +179,10 @@ public class ProductPropertyController extends DefaultBaseController { * 属性模型 */ @ApiOperation("属性模型") - @ApiImplicitParam(value = "类目ID", name = "categoryId", paramType = "query", required = true) + @ApiImplicitParam(value = "分类ID", name = "categoryId", paramType = "query", required = true) @GetMapping("/modelor/category") public InvokeResult> getModelorByCategory( - @NotBlank(message = "类目ID不能为空！") String categoryId) { + @NotBlank(message = "分类ID不能为空！") String categoryId) { List datas = productPropertyService.getModelorByCategoryId( categoryId); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/StoreCenterController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/StoreCenterController.java index c0ac2c893b9d42b604c31ab256ce7cc1c5c2ea6a..502e34534e745ed9a3f77bc6e4e1d145fcd17209 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/StoreCenterController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/StoreCenterController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.storecenter.GetStoreCenterBo; import com.lframework.xingyun.basedata.bo.storecenter.QueryStoreCenterBo; import com.lframework.xingyun.basedata.entity.StoreCenter; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -96,37 +95,33 @@ public class StoreCenterController extends DefaultBaseController { } /** - * 批量停用仓库 + * 停用仓库 */ - @ApiOperation("批量停用仓库") + @ApiOperation("停用仓库") @HasPermission({"base-data:store-center:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的仓库！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "仓库ID不能为空！") String id) { - storeCenterService.batchUnable(ids); + storeCenterService.unable(id); - for (String id : ids) { - storeCenterService.cleanCacheByKey(id); - } + storeCenterService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用仓库 + * 启用仓库 */ - @ApiOperation("批量启用仓库") + @ApiOperation("启用仓库") @HasPermission({"base-data:store-center:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的仓库！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "仓库ID不能为空！") String id) { - storeCenterService.batchEnable(ids); + storeCenterService.enable(id); - for (String id : ids) { - storeCenterService.cleanCacheByKey(id); - } + storeCenterService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/SupplierController.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/SupplierController.java index ec45a25f784dea6a8cd5099e675bc57780a00305..463b02114506a01dc68b00f47d310c98c749f8d4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/SupplierController.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/controller/SupplierController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.basedata.controller; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.bo.supplier.GetSupplierBo; import com.lframework.xingyun.basedata.bo.supplier.QuerySupplierBo; import com.lframework.xingyun.basedata.entity.Supplier; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -96,37 +95,33 @@ public class SupplierController extends DefaultBaseController { } /** - * 批量停用供应商 + * 停用供应商 */ - @ApiOperation("批量停用供应商") + @ApiOperation("停用供应商") @HasPermission({"base-data:supplier:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的供应商！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "供应商ID不能为空！") String id) { - supplierService.batchUnable(ids); + supplierService.unable(id); - for (String id : ids) { - supplierService.cleanCacheByKey(id); - } + supplierService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用供应商 + * 启用供应商 */ - @ApiOperation("批量启用供应商") + @ApiOperation("启用供应商") @HasPermission({"base-data:supplier:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的供应商！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "供应商ID不能为空！") String id) { - supplierService.batchEnable(ids); + supplierService.enable(id); - for (String id : ids) { - supplierService.cleanCacheByKey(id); - } + supplierService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Customer.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Customer.java index 9e55217d5ff094bcb2dda3e3e4ed3c9cede0ea2b..a7f692290579a11e99ebc4da6ddeba1c84d3291a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Customer.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Customer.java @@ -39,7 +39,7 @@ public class Customer extends BaseEntity implements BaseDto { private String name; /** - * 助记码 + * 简码 */ private String mnemonicCode; @@ -79,7 +79,7 @@ public class Customer extends BaseEntity implements BaseDto { private String address; /** - * 结账方式 + * 结算方式 */ private SettleType settleType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Member.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Member.java index 8a42dba6e78e7af2cfbdefa10a2158c00e302a24..0c1c7dd8bb6d832a1765fc6353c92448f022e5d4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Member.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Member.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import com.lframework.starter.web.dto.BaseDto; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Product.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Product.java index 8c3ed0c4b4483f0cf21dcbe74439cb9bd8fde4f8..fe5dae9e7ccbd6630053fa877816a8d349f959f9 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Product.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Product.java @@ -52,12 +52,12 @@ public class Product extends BaseEntity implements BaseDto { private String skuCode; /** - * 外部编号 + * 简码 */ private String externalCode; /** - * 类目ID + * 分类ID */ private String categoryId; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategoryProperty.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategoryProperty.java index 50fec932535314ac829f211f2c155f90ba9576f0..a9c202207b6db87b68ac5029b76ac107f0265f8e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategoryProperty.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/ProductCategoryProperty.java @@ -30,7 +30,7 @@ public class ProductCategoryProperty extends BaseEntity implements BaseDto { private String propertyId; /** - * 商品类目ID + * 商品分类ID */ private String categoryId; } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Supplier.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Supplier.java index 490d647c6a9648b878f7a1e28bbc16fe2935fed6..968b654dc46da85e6678ab55c8b881e0d88a3253 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Supplier.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/entity/Supplier.java @@ -40,7 +40,7 @@ public class Supplier extends BaseEntity implements BaseDto { private String name; /** - * 助记码 + * 简码 */ private String mnemonicCode; @@ -90,7 +90,7 @@ public class Supplier extends BaseEntity implements BaseDto { private ManageType manageType; /** - * 结账方式 + * 结算方式 */ private SettleType settleType; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductCategoryNodeType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductCategoryNodeType.java index 437a0ad1774a042e909ff7d1b68d0ded59b8b898..85fd2ab85af3edcef1f2640a1b972a58995cede9 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductCategoryNodeType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/ProductCategoryNodeType.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.enums; -import com.lframework.xingyun.template.core.enums.NodeType; +import com.lframework.xingyun.core.enums.NodeType; import java.io.Serializable; import org.springframework.stereotype.Component; @@ -18,6 +18,6 @@ public final class ProductCategoryNodeType implements NodeType, Serializable { @Override public String getDesc() { - return "商品类目"; + return "商品分类"; } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/PropertyType.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/PropertyType.java index 919ba4de47349801f337a0f6f511caaf98869f10..6d57018adb789942f4881f8deb63f6f6922c5ea5 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/PropertyType.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/enums/PropertyType.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; public enum PropertyType implements BaseEnum { - COMMON(1, "通用属性"), APPOINT(2, "指定类目属性"), NONE(3, "无"); + COMMON(1, "通用属性"), APPOINT(2, "指定分类属性"), NONE(3, "无"); @EnumValue private final Integer code; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportModel.java index c6af8e968a886764c6b11c69e37d7731760e1a2a..2e9891ef2b92edddd556c7474b9d76761c44d0d4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressExportModel.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.excel.address; import com.alibaba.excel.annotation.ExcelProperty; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.entity.Customer; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportListener.java index eb1c2c556f2c6a0e0469978aa03945c04f2dcf82..032c8f7a346c96bac131fe274df28d59522015d3 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/address/AddressImportListener.java @@ -7,7 +7,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.components.excel.ExcelImportListener; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.entity.Member; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportListener.java index 3a74ced92e1dfeb15ffb41f00be4e53f567686b6..e93bebae4b8864187cf9e6c5360c1d09d1306dd6 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/customer/CustomerImportListener.java @@ -9,7 +9,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelImportListener; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; @@ -56,16 +56,16 @@ public class CustomerImportListener extends ExcelImportListener } if (checkList.contains(data.getCode())) { throw new DefaultClientException( - "第" + context.readRowHolder().getRowIndex() + "行“编号”与第" + (checkList.indexOf(data.getCode()) + 1) + "行重复"); + "第" + context.readRowHolder().getRowIndex() + "行“编号”与第" + ( + checkList.indexOf(data.getCode()) + 1) + "行重复"); } checkList.add(data.getCode()); Wrapper checkWrapper = Wrappers.lambdaQuery(Member.class) @@ -91,8 +92,8 @@ public class MemberImportListener extends ExcelImportListener } if (!StringUtil.isEmpty(data.getGuiderCode())) { - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto guider = userService.findByCode(data.getGuiderCode()); + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser guider = userService.findByCode(data.getGuiderCode()); if (guider == null) { throw new DefaultClientException( "第" + context.readRowHolder().getRowIndex() + "行“所属导购编号”不存在"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportModel.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportModel.java index dd5e7ad519e638175c556c43c2a316ba428e8a9a..d5a502a1e34cc9aee95b983e153516cbefa4a13b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportModel.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/member/MemberImportModel.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.excel.member; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import com.lframework.starter.web.annotations.excel.ExcelRequired; import com.lframework.starter.web.components.excel.ExcelModel; import java.util.Date; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportListener.java index f209fdf3044568c394b33fccf2680577b61fd6cc..1129014ace4c853c0ca524eecdab5a2a4d14187d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/product/ProductImportListener.java @@ -9,7 +9,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelImportListener; import com.lframework.starter.web.utils.IdUtil; import com.lframework.xingyun.basedata.entity.Product; @@ -89,7 +89,7 @@ public class ProductImportListener extends ExcelImportListener t.getCode().equals(data.getParentCode()))) { throw new DefaultClientException( - "第" + context.readRowHolder().getRowIndex() + "行“上级类目编号”不存在"); + "第" + context.readRowHolder().getRowIndex() + "行“上级分类编号”不存在"); } } - // 不允许改变上级类目 + // 不允许改变上级分类 Wrapper queryWrapper = Wrappers.lambdaQuery(ProductCategory.class) .eq(ProductCategory::getCode, data.getCode()); ProductCategory productCategory = productCategoryService.getOne(queryWrapper); @@ -72,7 +72,7 @@ public class ProductCategoryImportListener extends ExcelImportListener { "第" + context.readRowHolder().getRowIndex() + "行“名称”不能为空"); } if (!StringUtil.isBlank(data.getDeptCode())) { - DeptService deptService = ApplicationUtil.getBean(DeptService.class); - DeptDto dept = deptService.findByCode(data.getDeptCode()); + SysDeptService deptService = ApplicationUtil.getBean(SysDeptService.class); + SysDept dept = deptService.findByCode(data.getDeptCode()); if (dept == null) { throw new DefaultClientException( "第" + context.readRowHolder().getRowIndex() + "行“所属部门编号”不存在"); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportListener.java index 7fcf1d5ac16fdab67a85d699c062f5335e8ef4a9..7e2133beabed1e6cc059416b05213426d91666c9 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/storecenter/StoreCenterImportListener.java @@ -8,7 +8,7 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelImportListener; import com.lframework.starter.web.utils.IdUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; @@ -16,9 +16,7 @@ import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportListener.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportListener.java index 48537c5dabde56dd925ee745cb603cc0f6a5e270..a8193d5fb43858908ab2a720becfb55f30c89068 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportListener.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/excel/supplier/SupplierImportListener.java @@ -9,7 +9,7 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelImportListener; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; @@ -57,16 +57,16 @@ public class SupplierImportListener extends ExcelImportListener implements CustomerService { - @Autowired - private DicCityService dicCityService; + @Autowired + private DicCityService dicCityService; - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryCustomerVo vo) { + @Override + public PageResult query(Integer pageIndex, Integer pageSize, QueryCustomerVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QueryCustomerVo vo) { + + return getBaseMapper().query(vo); + } + + @Cacheable(value = Customer.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") + @Override + public Customer findById(String id) { + + return getBaseMapper().selectById(id); + } + + @Override + public PageResult selector(Integer pageIndex, Integer pageSize, + QueryCustomerSelectorVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + + List datas = getBaseMapper().selector(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用客户，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void unable(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) + .set(Customer::getAvailable, Boolean.FALSE).eq(Customer::getId, id); + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用客户，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void enable(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) + .set(Customer::getAvailable, Boolean.TRUE).eq(Customer::getId, id); + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增客户，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateCustomerVo vo) { + + Wrapper checkWrapper = Wrappers.lambdaQuery(Customer.class) + .eq(Customer::getCode, vo.getCode()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); + } + + Customer data = new Customer(); + data.setId(IdUtil.getId()); + data.setCode(vo.getCode()); + data.setName(vo.getName()); + if (!StringUtil.isBlank(vo.getMnemonicCode())) { + data.setMnemonicCode(vo.getMnemonicCode()); + } + if (!StringUtil.isBlank(vo.getContact())) { + data.setContact(vo.getContact()); + } + if (!StringUtil.isBlank(vo.getTelephone())) { + data.setTelephone(vo.getTelephone()); } + if (!StringUtil.isBlank(vo.getEmail())) { + data.setEmail(vo.getEmail()); + } + if (!StringUtil.isBlank(vo.getZipCode())) { + data.setZipCode(vo.getZipCode()); + } + if (!StringUtil.isBlank(vo.getFax())) { + data.setFax(vo.getFax()); + } + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + data.setCityId(vo.getCityId()); + } + } + if (!StringUtil.isBlank(vo.getAddress())) { + data.setAddress(vo.getAddress()); + } + data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType())); + if (!StringUtil.isBlank(vo.getCreditCode())) { + data.setCreditCode(vo.getCreditCode()); + } + if (!StringUtil.isBlank(vo.getTaxIdentifyNo())) { + data.setTaxIdentifyNo(vo.getTaxIdentifyNo()); + } + if (!StringUtil.isBlank(vo.getBankName())) { + data.setBankName(vo.getBankName()); + } + if (!StringUtil.isBlank(vo.getAccountName())) { + data.setAccountName(vo.getAccountName()); + } + if (!StringUtil.isBlank(vo.getAccountNo())) { + data.setAccountNo(vo.getAccountNo()); + } + data.setAvailable(Boolean.TRUE); + data.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - @Override - public List query(QueryCustomerVo vo) { + getBaseMapper().insert(data); - return getBaseMapper().query(vo); - } - - @Cacheable(value = Customer.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public Customer findById(String id) { - - return getBaseMapper().selectById(id); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, QueryCustomerSelectorVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = getBaseMapper().selector(vo); + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用客户，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) - .set(Customer::getAvailable, Boolean.FALSE).in(Customer::getId, ids); - getBaseMapper().update(updateWrapper); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用客户，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) - .set(Customer::getAvailable, Boolean.TRUE).in(Customer::getId, ids); - getBaseMapper().update(updateWrapper); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增客户，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateCustomerVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(Customer.class).eq(Customer::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - Customer data = new Customer(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - if (!StringUtil.isBlank(vo.getMnemonicCode())) { - data.setMnemonicCode(vo.getMnemonicCode()); - } - if (!StringUtil.isBlank(vo.getContact())) { - data.setContact(vo.getContact()); - } - if (!StringUtil.isBlank(vo.getTelephone())) { - data.setTelephone(vo.getTelephone()); - } - if (!StringUtil.isBlank(vo.getEmail())) { - data.setEmail(vo.getEmail()); - } - if (!StringUtil.isBlank(vo.getZipCode())) { - data.setZipCode(vo.getZipCode()); - } - if (!StringUtil.isBlank(vo.getFax())) { - data.setFax(vo.getFax()); - } - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - data.setCityId(vo.getCityId()); - } - } - if (!StringUtil.isBlank(vo.getAddress())) { - data.setAddress(vo.getAddress()); - } - data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType())); - if (!StringUtil.isBlank(vo.getCreditCode())) { - data.setCreditCode(vo.getCreditCode()); - } - if (!StringUtil.isBlank(vo.getTaxIdentifyNo())) { - data.setTaxIdentifyNo(vo.getTaxIdentifyNo()); - } - if (!StringUtil.isBlank(vo.getBankName())) { - data.setBankName(vo.getBankName()); - } - if (!StringUtil.isBlank(vo.getAccountName())) { - data.setAccountName(vo.getAccountName()); - } - if (!StringUtil.isBlank(vo.getAccountNo())) { - data.setAccountNo(vo.getAccountNo()); - } - data.setAvailable(Boolean.TRUE); - data.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(data); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - - return data.getId(); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改客户，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateCustomerVo vo) { - - Customer data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("客户不存在！"); - } - - Wrapper checkWrapper = Wrappers.lambdaQuery(Customer.class).eq(Customer::getCode, vo.getCode()) - .ne(Customer::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) - .set(Customer::getCode, vo.getCode()).set(Customer::getName, vo.getName()) - .set(Customer::getMnemonicCode, !StringUtil.isBlank(vo.getMnemonicCode()) ? vo.getMnemonicCode() : null) - .set(Customer::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) - .set(Customer::getTelephone, !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) - .set(Customer::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) - .set(Customer::getEmail, !StringUtil.isBlank(vo.getEmail()) ? vo.getEmail() : null) - .set(Customer::getZipCode, !StringUtil.isBlank(vo.getZipCode()) ? vo.getZipCode() : null) - .set(Customer::getFax, !StringUtil.isBlank(vo.getFax()) ? vo.getFax() : null) - .set(Customer::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) - .set(Customer::getCreditCode, !StringUtil.isBlank(vo.getCreditCode()) ? vo.getCreditCode() : null) - .set(Customer::getTaxIdentifyNo, - !StringUtil.isBlank(vo.getTaxIdentifyNo()) ? vo.getTaxIdentifyNo() : null) - .set(Customer::getBankName, !StringUtil.isBlank(vo.getBankName()) ? vo.getBankName() : null) - .set(Customer::getAccountName, !StringUtil.isBlank(vo.getAccountName()) ? vo.getAccountName() : null) - .set(Customer::getAccountNo, !StringUtil.isBlank(vo.getAccountNo()) ? vo.getAccountNo() : null) - .set(Customer::getAvailable, vo.getAvailable()).set(Customer::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .eq(Customer::getId, vo.getId()); - - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - updateWrapper.set(Customer::getCityId, vo.getCityId()); - } - } else { - updateWrapper.set(Customer::getCityId, null); - } - - getBaseMapper().update(updateWrapper); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - @CacheEvict(value = Customer.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { + return data.getId(); + } + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改客户，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateCustomerVo vo) { + + Customer data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("客户不存在！"); + } + + Wrapper checkWrapper = Wrappers.lambdaQuery(Customer.class) + .eq(Customer::getCode, vo.getCode()) + .ne(Customer::getId, vo.getId()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); + } + + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(Customer.class) + .set(Customer::getCode, vo.getCode()).set(Customer::getName, vo.getName()) + .set(Customer::getMnemonicCode, + !StringUtil.isBlank(vo.getMnemonicCode()) ? vo.getMnemonicCode() : null) + .set(Customer::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) + .set(Customer::getTelephone, + !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) + .set(Customer::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) + .set(Customer::getEmail, !StringUtil.isBlank(vo.getEmail()) ? vo.getEmail() : null) + .set(Customer::getZipCode, !StringUtil.isBlank(vo.getZipCode()) ? vo.getZipCode() : null) + .set(Customer::getFax, !StringUtil.isBlank(vo.getFax()) ? vo.getFax() : null) + .set(Customer::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) + .set(Customer::getCreditCode, + !StringUtil.isBlank(vo.getCreditCode()) ? vo.getCreditCode() : null) + .set(Customer::getTaxIdentifyNo, + !StringUtil.isBlank(vo.getTaxIdentifyNo()) ? vo.getTaxIdentifyNo() : null) + .set(Customer::getBankName, !StringUtil.isBlank(vo.getBankName()) ? vo.getBankName() : null) + .set(Customer::getAccountName, + !StringUtil.isBlank(vo.getAccountName()) ? vo.getAccountName() : null) + .set(Customer::getAccountNo, + !StringUtil.isBlank(vo.getAccountNo()) ? vo.getAccountNo() : null) + .set(Customer::getAvailable, vo.getAvailable()).set(Customer::getDescription, + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) + .eq(Customer::getId, vo.getId()); + + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + updateWrapper.set(Customer::getCityId, vo.getCityId()); + } + } else { + updateWrapper.set(Customer::getCityId, null); } + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); + } + + @CacheEvict(value = Customer.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") + @Override + public void cleanCacheByKey(Serializable key) { + + } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/logistics/LogisticsCompanyServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/logistics/LogisticsCompanyServiceImpl.java index 84e406684ec39072d742ceeb9550b3c71f801d72..82b120f63e8fa8364d659b2f230a17e0ecde6ace 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/logistics/LogisticsCompanyServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/logistics/LogisticsCompanyServiceImpl.java @@ -7,28 +7,26 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; import com.lframework.xingyun.basedata.entity.LogisticsCompany; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.mappers.LogisticsCompanyMapper; import com.lframework.xingyun.basedata.service.logistics.LogisticsCompanyService; import com.lframework.xingyun.basedata.vo.logistics.company.CreateLogisticsCompanyVo; import com.lframework.xingyun.basedata.vo.logistics.company.QueryLogisticsCompanySelectorVo; import com.lframework.xingyun.basedata.vo.logistics.company.QueryLogisticsCompanyVo; import com.lframework.xingyun.basedata.vo.logistics.company.UpdateLogisticsCompanyVo; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -70,31 +68,23 @@ public class LogisticsCompanyServiceImpl extends return getBaseMapper().selectById(id); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用物流公司，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用物流公司，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(LogisticsCompany.class) - .set(LogisticsCompany::getAvailable, Boolean.FALSE).in(LogisticsCompany::getId, ids); + .set(LogisticsCompany::getAvailable, Boolean.FALSE).eq(LogisticsCompany::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用物流公司，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用物流公司，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(LogisticsCompany.class) - .set(LogisticsCompany::getAvailable, Boolean.TRUE).in(LogisticsCompany::getId, ids); + .set(LogisticsCompany::getAvailable, Boolean.TRUE).eq(LogisticsCompany::getId, id); getBaseMapper().update(updateWrapper); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/member/MemberServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/member/MemberServiceImpl.java index 388eb371e7bc69f578675326261ff914d0bf3b25..12de7f445f396c1a9a9714527ff59dd98a17352a 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/member/MemberServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/member/MemberServiceImpl.java @@ -7,28 +7,26 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.Gender; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.entity.Member; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.mappers.MemberMapper; import com.lframework.xingyun.basedata.service.member.MemberService; import com.lframework.xingyun.basedata.vo.member.CreateMemberVo; import com.lframework.xingyun.basedata.vo.member.QueryMemberSelectorVo; import com.lframework.xingyun.basedata.vo.member.QueryMemberVo; import com.lframework.xingyun.basedata.vo.member.UpdateMemberVo; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.Gender; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -64,37 +62,30 @@ public class MemberServiceImpl extends BaseMpServiceImpl i return getBaseMapper().selectById(id); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用会员，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用会员，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(Member.class) .set(Member::getAvailable, Boolean.FALSE) - .in(Member::getId, ids); + .eq(Member::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用会员，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用会员，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(Member.class) .set(Member::getAvailable, Boolean.TRUE) - .in(Member::getId, ids); + .eq(Member::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增会员，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增会员，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateMemberVo vo) { @@ -149,7 +140,8 @@ public class MemberServiceImpl extends BaseMpServiceImpl i return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改会员，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改会员，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateMemberVo vo) { diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/paytype/PayTypeServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/paytype/PayTypeServiceImpl.java index bf349bd5fde4bae396e99e5f89c1e148d25f4809..df27c3c1318d6a2ee8b0d1cf741072127628e9af 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/paytype/PayTypeServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/paytype/PayTypeServiceImpl.java @@ -9,11 +9,11 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.IdUtil; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductBrandServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductBrandServiceImpl.java index 032842dc88d7abb16730e344fd0b7bc37d6855ac..cfa320e8748d64fe476a8b826e485fb5c2283295 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductBrandServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductBrandServiceImpl.java @@ -10,11 +10,11 @@ import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.IdUtil; @@ -74,31 +74,23 @@ public class ProductBrandServiceImpl extends BaseMpServiceImpl ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductBrand.class) - .set(ProductBrand::getAvailable, Boolean.FALSE).in(ProductBrand::getId, ids); + .set(ProductBrand::getAvailable, Boolean.FALSE).eq(ProductBrand::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品品牌，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品品牌，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductBrand.class) - .set(ProductBrand::getAvailable, Boolean.TRUE).in(ProductBrand::getId, ids); + .set(ProductBrand::getAvailable, Boolean.TRUE).eq(ProductBrand::getId, id); getBaseMapper().update(updateWrapper); } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductCategoryServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductCategoryServiceImpl.java index 7b59837ca86ccb52050be41f5586a68c1a678aca..35ad0061ae3c418be94b2bb1316d124ae66a311c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductCategoryServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductCategoryServiceImpl.java @@ -7,23 +7,22 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.xingyun.basedata.entity.ProductCategory; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.enums.ProductCategoryNodeType; import com.lframework.xingyun.basedata.mappers.ProductCategoryMapper; import com.lframework.xingyun.basedata.service.product.ProductCategoryService; import com.lframework.xingyun.basedata.vo.product.category.CreateProductCategoryVo; import com.lframework.xingyun.basedata.vo.product.category.QueryProductCategorySelectorVo; import com.lframework.xingyun.basedata.vo.product.category.UpdateProductCategoryVo; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -58,61 +57,44 @@ public class ProductCategoryServiceImpl extends return getBaseMapper().selector(vo); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用商品类目，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用商品分类，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { List batchIds = new ArrayList<>(); - for (String id : ids) { - List nodeChildIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); - if (CollectionUtil.isEmpty(nodeChildIds)) { - continue; - } - + batchIds.add(id); + List nodeChildIds = recursionMappingService.getNodeChildIds(id, + ApplicationUtil.getBean(ProductCategoryNodeType.class)); + if (CollectionUtil.isNotEmpty(nodeChildIds)) { batchIds.addAll(nodeChildIds); } - batchIds.addAll(ids); - Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductCategory.class) .set(ProductCategory::getAvailable, Boolean.FALSE).in(ProductCategory::getId, batchIds); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品类目，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品分类，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { List batchIds = new ArrayList<>(); - for (String id : ids) { - List nodeParentIds = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(ProductCategoryNodeType.class)); - if (CollectionUtil.isEmpty(nodeParentIds)) { - continue; - } - + batchIds.add(id); + List nodeParentIds = recursionMappingService.getNodeParentIds(id, + ApplicationUtil.getBean(ProductCategoryNodeType.class)); + if (CollectionUtil.isNotEmpty(nodeParentIds)) { batchIds.addAll(nodeParentIds); } - batchIds.addAll(ids); - Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductCategory.class) .set(ProductCategory::getAvailable, Boolean.TRUE).in(ProductCategory::getId, batchIds); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品类目，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品分类，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateProductCategoryVo vo) { @@ -131,12 +113,12 @@ public class ProductCategoryServiceImpl extends throw new DefaultClientException("名称重复，请重新输入！"); } - //如果parentId不为空，查询上级类目是否存在 + //如果parentId不为空，查询上级分类是否存在 if (!StringUtil.isBlank(vo.getParentId())) { Wrapper checkParentWrapper = Wrappers.lambdaQuery(ProductCategory.class) .eq(ProductCategory::getId, vo.getParentId()); if (getBaseMapper().selectCount(checkParentWrapper) == 0) { - throw new DefaultClientException("上级类目不存在，请检查！"); + throw new DefaultClientException("上级分类不存在，请检查！"); } } @@ -161,14 +143,15 @@ public class ProductCategoryServiceImpl extends return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品类目，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品分类，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateProductCategoryVo vo) { ProductCategory data = getBaseMapper().selectById(vo.getId()); if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("类目不存在！"); + throw new DefaultClientException("分类不存在！"); } //查询Code是否重复 @@ -197,20 +180,12 @@ public class ProductCategoryServiceImpl extends if (!vo.getAvailable()) { if (data.getAvailable()) { //如果是停用 子节点全部停用 - List childrenIds = recursionMappingService.getNodeChildIds(data.getId(), - ApplicationUtil.getBean(ProductCategoryNodeType.class)); - if (!CollectionUtil.isEmpty(childrenIds)) { - this.batchUnable(childrenIds); - } + this.unable(data.getId()); } } else { if (!data.getAvailable()) { //如果是启用 父节点全部启用 - List parentIds = recursionMappingService.getNodeParentIds(data.getId(), - ApplicationUtil.getBean(ProductCategoryNodeType.class)); - if (!CollectionUtil.isEmpty(parentIds)) { - this.batchEnable(parentIds); - } + this.enable(data.getId()); } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyItemServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyItemServiceImpl.java index 510f42e0f913772a1532507a74c74881388231d8..5535508d305741e41563b03642ddc276ae73531f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyItemServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyItemServiceImpl.java @@ -8,11 +8,11 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.IdUtil; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyServiceImpl.java index 6fadfae2d1712307828043483f086a5fff999b2f..6a128653b0f0b3c3e83b328301a6f3e871a2a9ac 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPropertyServiceImpl.java @@ -11,21 +11,18 @@ import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.dto.product.property.ProductPropertyModelorDto; import com.lframework.xingyun.basedata.entity.ProductCategory; import com.lframework.xingyun.basedata.entity.ProductCategoryProperty; import com.lframework.xingyun.basedata.entity.ProductProperty; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.enums.ColumnDataType; import com.lframework.xingyun.basedata.enums.ColumnType; import com.lframework.xingyun.basedata.enums.ProductCategoryNodeType; @@ -38,9 +35,11 @@ import com.lframework.xingyun.basedata.service.product.ProductPropertyService; import com.lframework.xingyun.basedata.vo.product.property.CreateProductPropertyVo; import com.lframework.xingyun.basedata.vo.product.property.QueryProductPropertyVo; import com.lframework.xingyun.basedata.vo.product.property.UpdateProductPropertyVo; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -94,31 +93,23 @@ public class ProductPropertyServiceImpl extends return getBaseMapper().selectById(id); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用商品属性，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用商品属性，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductProperty.class) - .set(ProductProperty::getAvailable, Boolean.FALSE).in(ProductProperty::getId, ids); + .set(ProductProperty::getAvailable, Boolean.FALSE).eq(ProductProperty::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品属性，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用商品属性，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(ProductProperty.class) - .set(ProductProperty::getAvailable, Boolean.TRUE).in(ProductProperty::getId, ids); + .set(ProductProperty::getAvailable, Boolean.TRUE).eq(ProductProperty::getId, id); getBaseMapper().update(updateWrapper); } @@ -128,7 +119,7 @@ public class ProductPropertyServiceImpl extends return CollectionUtil.emptyList(); } - //先整理categoryId，因为可能父级类目和子级类目全传过来了 + //先整理categoryId，因为可能父级分类和子级分类全传过来了 Set childCategoryIds = new HashSet<>(); for (String categoryId : categoryIds) { @@ -147,7 +138,8 @@ public class ProductPropertyServiceImpl extends return results; } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品属性，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增商品属性，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateProductPropertyVo vo) { @@ -165,15 +157,15 @@ public class ProductPropertyServiceImpl extends } if (vo.getPropertyType() == PropertyType.APPOINT.getCode().intValue()) { - //如果是指定类目 + //如果是指定分类 if (CollectionUtil.isEmpty(vo.getCategoryIds())) { - throw new InputErrorException("请选择商品类目！"); + throw new InputErrorException("请选择商品分类！"); } for (String categoryId : vo.getCategoryIds()) { ProductCategory productCategory = productCategoryService.findById(categoryId); if (productCategory == null) { - throw new InputErrorException("商品类目数据有误，请检查！"); + throw new InputErrorException("商品分类数据有误，请检查！"); } } @@ -213,7 +205,8 @@ public class ProductPropertyServiceImpl extends return data.getId(); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品属性，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改商品属性，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public void update(UpdateProductPropertyVo vo) { @@ -238,7 +231,8 @@ public class ProductPropertyServiceImpl extends //如果字段类型是手动录入，那么不允许修改字段类型 if (data.getColumnType() == ColumnType.CUSTOM) { if (vo.getColumnType() != ColumnType.CUSTOM.getCode().intValue()) { - throw new InputErrorException("该属性的字段类型为“" + ColumnType.CUSTOM.getDesc() + "”，不允许修改！"); + throw new InputErrorException( + "该属性的字段类型为“" + ColumnType.CUSTOM.getDesc() + "”，不允许修改！"); } if (vo.getColumnDataType() == null) { @@ -257,7 +251,8 @@ public class ProductPropertyServiceImpl extends if (data.getColumnType() != ColumnType.CUSTOM && vo.getColumnType() == ColumnType.CUSTOM.getCode().intValue()) { //从其他类型更改为手动录入 - throw new InputErrorException("该属性不允许将字段类型修改为“" + ColumnType.CUSTOM.getDesc() + "”！"); + throw new InputErrorException( + "该属性不允许将字段类型修改为“" + ColumnType.CUSTOM.getDesc() + "”！"); } if (data.getPropertyType() != PropertyType.NONE @@ -271,15 +266,15 @@ public class ProductPropertyServiceImpl extends List oldProductCategoryPropertyList = new ArrayList<>(); if (vo.getPropertyType() == PropertyType.APPOINT.getCode().intValue()) { - //如果是指定类目 + //如果是指定分类 if (CollectionUtil.isEmpty(vo.getCategoryIds())) { - throw new InputErrorException("请选择商品类目！"); + throw new InputErrorException("请选择商品分类！"); } for (String categoryId : vo.getCategoryIds()) { ProductCategory productCategory = productCategoryService.findById(categoryId); if (productCategory == null) { - throw new InputErrorException("商品类目数据有误，请检查！"); + throw new InputErrorException("商品分类数据有误，请检查！"); } } @@ -326,12 +321,12 @@ public class ProductPropertyServiceImpl extends if (data.getPropertyType() == PropertyType.COMMON && vo.getPropertyType() == PropertyType.APPOINT.getCode() .intValue()) { - //从通用改成指定类目 + //从通用改成指定分类 productPropertyRelationService.setCommonToAppoint(data.getId()); } else if (data.getPropertyType() == PropertyType.APPOINT && vo.getPropertyType() == PropertyType.COMMON.getCode().intValue()) { - //从指定类目改成通用 + //从指定分类改成通用 productPropertyRelationService.setAppointToCommon(data.getId()); } else if (data.getPropertyType() == PropertyType.APPOINT && vo.getPropertyType() == PropertyType.APPOINT.getCode().intValue()) { @@ -340,7 +335,7 @@ public class ProductPropertyServiceImpl extends boolean isUpdateCategory = CollectionUtil.isEqualList(oldCategoryIds, vo.getCategoryIds()); if (isUpdateCategory) { - //更改了类目ID + //更改了分类ID productPropertyRelationService.updateAppointCategoryId(data.getId()); } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPurchaseServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPurchaseServiceImpl.java index 0ff3e52723eadd55a0f1bf9e01f1c3fb662b1e1f..57c44c9bd7ddb317695ad8dd5558ab93af087760 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPurchaseServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductPurchaseServiceImpl.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.impl.product; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.IdUtil; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductRetailServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductRetailServiceImpl.java index 965bdfcb9c7166b20cf40e7344b35d7ede8acefa..dbabf0eda966f0bfb3f4129d7627919440ac7e18 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductRetailServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductRetailServiceImpl.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.impl.product; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.IdUtil; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductSaleServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductSaleServiceImpl.java index 7b9cceef8012ff78991a0056ac237e8cb1ca448e..8426068b9c9f7d4249dad86d4ed1f7a58aa46a86 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductSaleServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductSaleServiceImpl.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.basedata.impl.product; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.IdUtil; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductServiceImpl.java index 87052621cd403afde173ae246677103c4fcc8a73..0d19c72e0647573618e9c9a14ee00929d76e8fa4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/product/ProductServiceImpl.java @@ -10,7 +10,7 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.EnumUtil; @@ -46,10 +46,10 @@ import com.lframework.xingyun.basedata.vo.product.retail.CreateProductRetailVo; import com.lframework.xingyun.basedata.vo.product.retail.UpdateProductRetailVo; import com.lframework.xingyun.basedata.vo.product.sale.CreateProductSaleVo; import com.lframework.xingyun.basedata.vo.product.sale.UpdateProductSaleVo; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/shop/ShopServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/shop/ShopServiceImpl.java index 161effcb3efebc9ce23b9125438d63ab50988034..69ac6a17782fb3bcca5d6884333d9e34e7dddf1d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/shop/ShopServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/shop/ShopServiceImpl.java @@ -4,15 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.IdUtil; @@ -116,7 +117,7 @@ public class ShopServiceImpl extends BaseMpServiceImpl impleme .set(Shop::getLat, vo.getLat() == null ? null : vo.getLat()) .set(Shop::getAvailable, vo.getAvailable()) .set(Shop::getDescription, - StringUtil.isBlank(vo.getDescription()) ? null : vo.getDescription()) + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) .eq(Shop::getId, vo.getId()); getBaseMapper().update(updateWrapper); diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/storecenter/StoreCenterServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/storecenter/StoreCenterServiceImpl.java index 43ec42e1ac23dacef788258cf4d5e58b5a4ac13f..7f789fee402722c7d7b35a857036cf193a40d34e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/storecenter/StoreCenterServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/storecenter/StoreCenterServiceImpl.java @@ -8,28 +8,26 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; import com.lframework.xingyun.basedata.entity.StoreCenter; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.mappers.StoreCenterMapper; import com.lframework.xingyun.basedata.service.storecenter.StoreCenterService; import com.lframework.xingyun.basedata.vo.storecenter.CreateStoreCenterVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterSelectorVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterVo; import com.lframework.xingyun.basedata.vo.storecenter.UpdateStoreCenterVo; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -39,175 +37,172 @@ import org.springframework.transaction.annotation.Transactional; @Service public class StoreCenterServiceImpl extends BaseMpServiceImpl - implements StoreCenterService { + implements StoreCenterService { - @Autowired - private DicCityService dicCityService; + @Autowired + private DicCityService dicCityService; - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryStoreCenterVo vo) { + @Override + public PageResult query(Integer pageIndex, Integer pageSize, QueryStoreCenterVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().query(vo); + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = getBaseMapper().query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } + return PageResultUtil.convert(new PageInfo<>(datas)); + } - @Cacheable(value = StoreCenter.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public StoreCenter findById(String id) { + @Cacheable(value = StoreCenter.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") + @Override + public StoreCenter findById(String id) { - return getBaseMapper().selectById(id); - } + return getBaseMapper().selectById(id); + } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用仓库，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUnable(Collection ids) { + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用仓库，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void unable(String id) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) + .set(StoreCenter::getAvailable, Boolean.FALSE).eq(StoreCenter::getId, id); + getBaseMapper().update(updateWrapper); + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) - .set(StoreCenter::getAvailable, Boolean.FALSE).in(StoreCenter::getId, ids); - getBaseMapper().update(updateWrapper); - } + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用仓库，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void enable(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) + .set(StoreCenter::getAvailable, Boolean.TRUE).eq(StoreCenter::getId, id); + getBaseMapper().update(updateWrapper); + } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用仓库，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(Collection ids) { + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增仓库，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateStoreCenterVo vo) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + Wrapper checkWrapper = Wrappers.lambdaQuery(StoreCenter.class) + .eq(StoreCenter::getCode, vo.getCode()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) - .set(StoreCenter::getAvailable, Boolean.TRUE).in(StoreCenter::getId, ids); - getBaseMapper().update(updateWrapper); + StoreCenter data = new StoreCenter(); + data.setId(IdUtil.getId()); + data.setCode(vo.getCode()); + data.setName(vo.getName()); + if (!StringUtil.isBlank(vo.getContact())) { + data.setContact(vo.getContact()); + } + if (!StringUtil.isBlank(vo.getTelephone())) { + data.setTelephone(vo.getTelephone()); + } + data.setAvailable(Boolean.TRUE); + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + data.setCityId(vo.getCityId()); + } } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增仓库，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateStoreCenterVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(StoreCenter.class) - .eq(StoreCenter::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - StoreCenter data = new StoreCenter(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - if (!StringUtil.isBlank(vo.getContact())) { - data.setContact(vo.getContact()); - } - if (!StringUtil.isBlank(vo.getTelephone())) { - data.setTelephone(vo.getTelephone()); - } - data.setAvailable(Boolean.TRUE); - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - data.setCityId(vo.getCityId()); - } - } - - if (!StringUtil.isBlank(vo.getAddress())) { - data.setAddress(vo.getAddress()); - } - - if (vo.getPeopleNum() != null) { - if (vo.getPeopleNum() < 0) { - throw new InputErrorException("仓库人数不允许小于0！"); - } - data.setPeopleNum(vo.getPeopleNum()); - } - - data.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(data); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - - return data.getId(); + if (!StringUtil.isBlank(vo.getAddress())) { + data.setAddress(vo.getAddress()); } - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改仓库，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateStoreCenterVo vo) { - - StoreCenter data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("仓库不存在！"); - } - - Wrapper checkWrapper = Wrappers.lambdaQuery(StoreCenter.class) - .eq(StoreCenter::getCode, vo.getCode()).ne(StoreCenter::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) - .set(StoreCenter::getCode, vo.getCode()).set(StoreCenter::getName, vo.getName()) - .set(StoreCenter::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) - .set(StoreCenter::getTelephone, !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) - .set(StoreCenter::getAvailable, vo.getAvailable()) - .set(StoreCenter::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) - .set(StoreCenter::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .eq(StoreCenter::getId, vo.getId()); - - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - updateWrapper.set(StoreCenter::getCityId, vo.getCityId()); - } - } else { - updateWrapper.set(StoreCenter::getCityId, null); - } - - if (vo.getPeopleNum() != null) { - if (vo.getPeopleNum() < 0) { - throw new InputErrorException("仓库人数不允许小于0！"); - } - updateWrapper.set(StoreCenter::getPeopleNum, vo.getPeopleNum()); - } else { - updateWrapper.set(StoreCenter::getPeopleNum, null); - } - - getBaseMapper().update(updateWrapper); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); + if (vo.getPeopleNum() != null) { + if (vo.getPeopleNum() < 0) { + throw new InputErrorException("仓库人数不允许小于0！"); + } + data.setPeopleNum(vo.getPeopleNum()); } - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, QueryStoreCenterSelectorVo vo) { + data.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + + getBaseMapper().insert(data); - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); + return data.getId(); + } - return PageResultUtil.convert(new PageInfo<>(datas)); + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改仓库，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateStoreCenterVo vo) { + + StoreCenter data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("仓库不存在！"); + } + + Wrapper checkWrapper = Wrappers.lambdaQuery(StoreCenter.class) + .eq(StoreCenter::getCode, vo.getCode()).ne(StoreCenter::getId, vo.getId()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); } - @CacheEvict(value = StoreCenter.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(StoreCenter.class) + .set(StoreCenter::getCode, vo.getCode()).set(StoreCenter::getName, vo.getName()) + .set(StoreCenter::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) + .set(StoreCenter::getTelephone, + !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) + .set(StoreCenter::getAvailable, vo.getAvailable()) + .set(StoreCenter::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) + .set(StoreCenter::getDescription, + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) + .eq(StoreCenter::getId, vo.getId()); + + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + updateWrapper.set(StoreCenter::getCityId, vo.getCityId()); + } + } else { + updateWrapper.set(StoreCenter::getCityId, null); + } + if (vo.getPeopleNum() != null) { + if (vo.getPeopleNum() < 0) { + throw new InputErrorException("仓库人数不允许小于0！"); + } + updateWrapper.set(StoreCenter::getPeopleNum, vo.getPeopleNum()); + } else { + updateWrapper.set(StoreCenter::getPeopleNum, null); } + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); + } + + @Override + public PageResult selector(Integer pageIndex, Integer pageSize, + QueryStoreCenterSelectorVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = getBaseMapper().selector(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @CacheEvict(value = StoreCenter.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") + @Override + public void cleanCacheByKey(Serializable key) { + + } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/supplier/SupplierServiceImpl.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/supplier/SupplierServiceImpl.java index 1dfa6ad653e32ace04fc7c5567bba1ca012ab6cb..26dd231ec84d64f7e8321b48ed0dc1b4b9de3fb1 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/supplier/SupplierServiceImpl.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/impl/supplier/SupplierServiceImpl.java @@ -7,19 +7,16 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.basedata.entity.Supplier; +import com.lframework.xingyun.basedata.enums.BaseDataOpLogType; import com.lframework.xingyun.basedata.enums.ManageType; import com.lframework.xingyun.basedata.enums.SettleType; import com.lframework.xingyun.basedata.mappers.SupplierMapper; @@ -28,10 +25,11 @@ import com.lframework.xingyun.basedata.vo.supplier.CreateSupplierVo; import com.lframework.xingyun.basedata.vo.supplier.QuerySupplierSelectorVo; import com.lframework.xingyun.basedata.vo.supplier.QuerySupplierVo; import com.lframework.xingyun.basedata.vo.supplier.UpdateSupplierVo; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -43,204 +41,207 @@ import org.springframework.transaction.annotation.Transactional; public class SupplierServiceImpl extends BaseMpServiceImpl implements SupplierService { - @Autowired - private DicCityService dicCityService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySupplierVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public List query(QuerySupplierVo vo) { - - return getBaseMapper().query(vo); - } - - @Cacheable(value = Supplier.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public Supplier findById(String id) { - - return getBaseMapper().selectById(id); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用供应商，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) - .set(Supplier::getAvailable, Boolean.FALSE).in(Supplier::getId, ids); - getBaseMapper().update(updateWrapper); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用供应商，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - Wrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) - .set(Supplier::getAvailable, Boolean.TRUE).in(Supplier::getId, ids); - getBaseMapper().update(updateWrapper); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增供应商，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSupplierVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(Supplier.class).eq(Supplier::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - Supplier data = new Supplier(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - if (!StringUtil.isBlank(vo.getMnemonicCode())) { - data.setMnemonicCode(vo.getMnemonicCode()); - } - if (!StringUtil.isBlank(vo.getContact())) { - data.setContact(vo.getContact()); - } - if (!StringUtil.isBlank(vo.getTelephone())) { - data.setTelephone(vo.getTelephone()); - } - if (!StringUtil.isBlank(vo.getEmail())) { - data.setEmail(vo.getEmail()); - } - if (!StringUtil.isBlank(vo.getZipCode())) { - data.setZipCode(vo.getZipCode()); - } - if (!StringUtil.isBlank(vo.getFax())) { - data.setFax(vo.getFax()); - } - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - data.setCityId(vo.getCityId()); - } - } - if (!StringUtil.isBlank(vo.getAddress())) { - data.setAddress(vo.getAddress()); - } - if (vo.getDeliveryCycle() != null) { - data.setDeliveryCycle(vo.getDeliveryCycle()); - } - data.setManageType(EnumUtil.getByCode(ManageType.class, vo.getManageType())); - - data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType())); - - if (!StringUtil.isBlank(vo.getCreditCode())) { - data.setCreditCode(vo.getCreditCode()); - } - if (!StringUtil.isBlank(vo.getTaxIdentifyNo())) { - data.setTaxIdentifyNo(vo.getTaxIdentifyNo()); - } - if (!StringUtil.isBlank(vo.getBankName())) { - data.setBankName(vo.getBankName()); - } - if (!StringUtil.isBlank(vo.getAccountName())) { - data.setAccountName(vo.getAccountName()); - } - if (!StringUtil.isBlank(vo.getAccountNo())) { - data.setAccountNo(vo.getAccountNo()); - } - data.setAvailable(Boolean.TRUE); - data.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(data); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - - return data.getId(); - } - - @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改供应商，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSupplierVo vo) { - - Supplier data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("供应商不存在！"); - } - - Wrapper checkWrapper = Wrappers.lambdaQuery(Supplier.class).eq(Supplier::getCode, vo.getCode()) - .ne(Supplier::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) - .set(Supplier::getCode, vo.getCode()).set(Supplier::getName, vo.getName()) - .set(Supplier::getMnemonicCode, !StringUtil.isBlank(vo.getMnemonicCode()) ? vo.getMnemonicCode() : null) - .set(Supplier::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) - .set(Supplier::getTelephone, !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) - .set(Supplier::getEmail, !StringUtil.isBlank(vo.getEmail()) ? vo.getEmail() : null) - .set(Supplier::getZipCode, !StringUtil.isBlank(vo.getZipCode()) ? vo.getZipCode() : null) - .set(Supplier::getFax, !StringUtil.isBlank(vo.getFax()) ? vo.getFax() : null) - .set(Supplier::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) - .set(Supplier::getDeliveryCycle, vo.getDeliveryCycle()) - .set(Supplier::getCreditCode, !StringUtil.isBlank(vo.getCreditCode()) ? vo.getCreditCode() : null) - .set(Supplier::getTaxIdentifyNo, - !StringUtil.isBlank(vo.getTaxIdentifyNo()) ? vo.getTaxIdentifyNo() : null) - .set(Supplier::getBankName, !StringUtil.isBlank(vo.getBankName()) ? vo.getBankName() : null) - .set(Supplier::getAccountName, !StringUtil.isBlank(vo.getAccountName()) ? vo.getAccountName() : null) - .set(Supplier::getAccountNo, !StringUtil.isBlank(vo.getAccountNo()) ? vo.getAccountNo() : null) - .set(Supplier::getAvailable, vo.getAvailable()).set(Supplier::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .eq(Supplier::getId, vo.getId()); - - if (!StringUtil.isBlank(vo.getCityId())) { - DicCityDto city = dicCityService.findById(vo.getCityId()); - if (!ObjectUtil.isNull(city)) { - updateWrapper.set(Supplier::getCityId, vo.getCityId()); - } - } else { - updateWrapper.set(Supplier::getCityId, null); - } - - getBaseMapper().update(updateWrapper); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, QuerySupplierSelectorVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = getBaseMapper().selector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @CacheEvict(value = Supplier.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { + @Autowired + private DicCityService dicCityService; + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, QuerySupplierVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QuerySupplierVo vo) { + + return getBaseMapper().query(vo); + } + + @Cacheable(value = Supplier.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") + @Override + public Supplier findById(String id) { + + return getBaseMapper().selectById(id); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "停用供应商，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void unable(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) + .set(Supplier::getAvailable, Boolean.FALSE).eq(Supplier::getId, id); + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "启用供应商，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void enable(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) + .set(Supplier::getAvailable, Boolean.TRUE).eq(Supplier::getId, id); + getBaseMapper().update(updateWrapper); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "新增供应商，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateSupplierVo vo) { + + Wrapper checkWrapper = Wrappers.lambdaQuery(Supplier.class) + .eq(Supplier::getCode, vo.getCode()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); + } + + Supplier data = new Supplier(); + data.setId(IdUtil.getId()); + data.setCode(vo.getCode()); + data.setName(vo.getName()); + if (!StringUtil.isBlank(vo.getMnemonicCode())) { + data.setMnemonicCode(vo.getMnemonicCode()); + } + if (!StringUtil.isBlank(vo.getContact())) { + data.setContact(vo.getContact()); + } + if (!StringUtil.isBlank(vo.getTelephone())) { + data.setTelephone(vo.getTelephone()); + } + if (!StringUtil.isBlank(vo.getEmail())) { + data.setEmail(vo.getEmail()); + } + if (!StringUtil.isBlank(vo.getZipCode())) { + data.setZipCode(vo.getZipCode()); + } + if (!StringUtil.isBlank(vo.getFax())) { + data.setFax(vo.getFax()); + } + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + data.setCityId(vo.getCityId()); + } + } + if (!StringUtil.isBlank(vo.getAddress())) { + data.setAddress(vo.getAddress()); + } + if (vo.getDeliveryCycle() != null) { + data.setDeliveryCycle(vo.getDeliveryCycle()); + } + data.setManageType(EnumUtil.getByCode(ManageType.class, vo.getManageType())); + + data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType())); + if (!StringUtil.isBlank(vo.getCreditCode())) { + data.setCreditCode(vo.getCreditCode()); + } + if (!StringUtil.isBlank(vo.getTaxIdentifyNo())) { + data.setTaxIdentifyNo(vo.getTaxIdentifyNo()); + } + if (!StringUtil.isBlank(vo.getBankName())) { + data.setBankName(vo.getBankName()); } + if (!StringUtil.isBlank(vo.getAccountName())) { + data.setAccountName(vo.getAccountName()); + } + if (!StringUtil.isBlank(vo.getAccountNo())) { + data.setAccountNo(vo.getAccountNo()); + } + data.setAvailable(Boolean.TRUE); + data.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + + getBaseMapper().insert(data); + + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); + + return data.getId(); + } + + @OpLog(type = BaseDataOpLogType.BASE_DATA, name = "修改供应商，ID：{}, 编号：{}", params = {"#id", + "#code"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSupplierVo vo) { + + Supplier data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("供应商不存在！"); + } + + Wrapper checkWrapper = Wrappers.lambdaQuery(Supplier.class) + .eq(Supplier::getCode, vo.getCode()) + .ne(Supplier::getId, vo.getId()); + if (getBaseMapper().selectCount(checkWrapper) > 0) { + throw new DefaultClientException("编号重复，请重新输入！"); + } + + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(Supplier.class) + .set(Supplier::getCode, vo.getCode()).set(Supplier::getName, vo.getName()) + .set(Supplier::getMnemonicCode, + !StringUtil.isBlank(vo.getMnemonicCode()) ? vo.getMnemonicCode() : null) + .set(Supplier::getContact, !StringUtil.isBlank(vo.getContact()) ? vo.getContact() : null) + .set(Supplier::getTelephone, + !StringUtil.isBlank(vo.getTelephone()) ? vo.getTelephone() : null) + .set(Supplier::getEmail, !StringUtil.isBlank(vo.getEmail()) ? vo.getEmail() : null) + .set(Supplier::getZipCode, !StringUtil.isBlank(vo.getZipCode()) ? vo.getZipCode() : null) + .set(Supplier::getFax, !StringUtil.isBlank(vo.getFax()) ? vo.getFax() : null) + .set(Supplier::getAddress, !StringUtil.isBlank(vo.getAddress()) ? vo.getAddress() : null) + .set(Supplier::getDeliveryCycle, vo.getDeliveryCycle()) + .set(Supplier::getCreditCode, + !StringUtil.isBlank(vo.getCreditCode()) ? vo.getCreditCode() : null) + .set(Supplier::getTaxIdentifyNo, + !StringUtil.isBlank(vo.getTaxIdentifyNo()) ? vo.getTaxIdentifyNo() : null) + .set(Supplier::getBankName, !StringUtil.isBlank(vo.getBankName()) ? vo.getBankName() : null) + .set(Supplier::getAccountName, + !StringUtil.isBlank(vo.getAccountName()) ? vo.getAccountName() : null) + .set(Supplier::getAccountNo, + !StringUtil.isBlank(vo.getAccountNo()) ? vo.getAccountNo() : null) + .set(Supplier::getAvailable, vo.getAvailable()).set(Supplier::getDescription, + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) + .eq(Supplier::getId, vo.getId()); + + if (!StringUtil.isBlank(vo.getCityId())) { + DicCityDto city = dicCityService.findById(vo.getCityId()); + if (!ObjectUtil.isNull(city)) { + updateWrapper.set(Supplier::getCityId, vo.getCityId()); + } + } else { + updateWrapper.set(Supplier::getCityId, null); + } + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setVariable("code", vo.getCode()); + OpLogUtil.setExtra(vo); + } + + @Override + public PageResult selector(Integer pageIndex, Integer pageSize, + QuerySupplierSelectorVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = getBaseMapper().selector(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @CacheEvict(value = Supplier.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") + @Override + public void cleanCacheByKey(Serializable key) { + + } } diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/AddressMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/AddressMapper.java index 2112480355740dffd856d8c1db09eb42af90680c..b6325a1b178ac27dd7c9b224c339baf0484fbb2e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/AddressMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/AddressMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Address; import com.lframework.xingyun.basedata.vo.address.AddressSelectorVo; import com.lframework.xingyun.basedata.vo.address.QueryAddressVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/CustomerMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/CustomerMapper.java index b860b6848ec84e642fd46b3c96bbf588259d1a69..b5e3c826f7c6db11be1400e4ba612d609269829e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/CustomerMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/CustomerMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.vo.customer.QueryCustomerSelectorVo; import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/LogisticsCompanyMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/LogisticsCompanyMapper.java index 03b94e0a12c23d8ea43c2669a1a3adb395002264..f5ecd583e1dd9cdc77931b00739b5625722654cf 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/LogisticsCompanyMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/LogisticsCompanyMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.LogisticsCompany; import com.lframework.xingyun.basedata.vo.logistics.company.QueryLogisticsCompanySelectorVo; import com.lframework.xingyun.basedata.vo.logistics.company.QueryLogisticsCompanyVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/MemberMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/MemberMapper.java index 6bfdd7227b395358a9eaced7141acc3f95ef7d83..03b2f25ce0da416ab59c7731ccbe751ac18ba62c 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/MemberMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/MemberMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Member; import com.lframework.xingyun.basedata.vo.member.QueryMemberSelectorVo; import com.lframework.xingyun.basedata.vo.member.QueryMemberVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PayTypeMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PayTypeMapper.java index b2de9a90b0c602f358fde21d90ef3ecc26e182a4..20c5b16bc880c5c505f09c367cdea59497c4812b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PayTypeMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/PayTypeMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.PayType; import com.lframework.xingyun.basedata.vo.paytype.PayTypeSelectorVo; import com.lframework.xingyun.basedata.vo.paytype.QueryPayTypeVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBrandMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBrandMapper.java index b102495a7f6354ac896b35f66404cc06d1348f2d..ee404c0728a02b164c8faeae1df7343d59450886 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBrandMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductBrandMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.ProductBrand; import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandSelectorVo; import com.lframework.xingyun.basedata.vo.product.brand.QueryProductBrandVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryMapper.java index 15bea9ac3d42a48a3999f4c85607b486685d07b8..3de781ce7ac4ed663d2b8d4c4298e25623421ef2 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductCategoryMapper.java @@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Param; public interface ProductCategoryMapper extends BaseMapper { /** - * 查询全部类目信息 + * 查询全部分类信息 * * @return */ diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductMapper.java index fd6dab8367ecedb1f4cd96ec9c37bf98054a3ff4..64d785c3a8bc0dbefa5fcfb17f117c70b9cbcd9b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductMapper.java @@ -4,11 +4,11 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Product; import com.lframework.xingyun.basedata.vo.product.info.QueryProductSelectorVo; import com.lframework.xingyun.basedata.vo.product.info.QueryProductVo; -import com.lframework.xingyun.template.core.annotations.permission.DataPermission; -import com.lframework.xingyun.template.core.annotations.permission.DataPermissions; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; -import com.lframework.xingyun.template.core.components.permission.SysDataPermissionDataPermissionType; +import com.lframework.xingyun.core.annotations.permission.DataPermission; +import com.lframework.xingyun.core.annotations.permission.DataPermissions; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.components.permission.SysDataPermissionDataPermissionType; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -79,7 +79,7 @@ public interface ProductMapper extends BaseMapper { List getIdNotInProductProperty(String propertyId); /** - * 根据类目ID查询 + * 根据分类ID查询 * * @param categoryId * @return @@ -87,7 +87,7 @@ public interface ProductMapper extends BaseMapper { List getIdByCategoryId(String categoryId); /** - * 根据类目ID查询 + * 根据分类ID查询 * * @param categoryIds * @return diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyMapper.java index c7b778e5d3b7e126873f27a38be9edad19a4b18f..8d5f7bf651b5690c3d177a1183a4a4783fb19af8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.dto.product.property.ProductPropertyModelorDto; import com.lframework.xingyun.basedata.entity.ProductProperty; import com.lframework.xingyun.basedata.vo.product.property.QueryProductPropertyVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.Collection; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -33,7 +33,7 @@ public interface ProductPropertyMapper extends BaseMapper { List query(@Param("vo") QueryProductPropertyVo vo); /** - * 根据商品类目查询 + * 根据商品分类查询 * * @param categoryIds * @return diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyRelationMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyRelationMapper.java index c5bdcc1abff673510c3877582ceb137f56c3b79f..e7f72faa1ab503a3893c1680ed0706e271f81e68 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyRelationMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ProductPropertyRelationMapper.java @@ -33,7 +33,7 @@ public interface ProductPropertyRelationMapper extends BaseMapper getByPropertyId(String propertyId); /** - * 将通用更改为指定类目 + * 将通用更改为指定分类 * * @param propertyId * @param categoryId diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ShopMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ShopMapper.java index 5fa16d92073b19d1f641b1f093cfd5994224da40..ed01f6ca0fcec90c2800ba30347d34a448f012a4 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ShopMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/ShopMapper.java @@ -3,8 +3,8 @@ package com.lframework.xingyun.basedata.mappers; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Shop; import com.lframework.xingyun.basedata.vo.shop.QueryShopVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/StoreCenterMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/StoreCenterMapper.java index c4582f9ad651ecdba1435e8d25209bf556b56777..fe7ddb80ddf45237fd75d0e0a36029af3f906cad 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/StoreCenterMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/StoreCenterMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.StoreCenter; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterSelectorVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/SupplierMapper.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/SupplierMapper.java index 89419e967bfefc4171678270c1a0e31d6c245902..6613bd1348a060e1ff489676bd03efb077cb3368 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/SupplierMapper.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/mappers/SupplierMapper.java @@ -4,8 +4,8 @@ import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.vo.supplier.QuerySupplierSelectorVo; import com.lframework.xingyun.basedata.vo.supplier.QuerySupplierVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/customer/CustomerService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/customer/CustomerService.java index 3ea471d4a82b066659f70aa8eab389f3da4bf9ce..2b3fca02513763c4afd5b1708f4deb6a4b42458d 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/customer/CustomerService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/customer/CustomerService.java @@ -45,16 +45,16 @@ public interface CustomerService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/logistics/LogisticsCompanyService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/logistics/LogisticsCompanyService.java index 2837874111f41c6d913f2e16251b6bfdbb6b8437..aad67f854a0b5dad562a17f140835e7da8dfc773 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/logistics/LogisticsCompanyService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/logistics/LogisticsCompanyService.java @@ -39,16 +39,16 @@ public interface LogisticsCompanyService extends BaseMpService /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/member/MemberService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/member/MemberService.java index 684c95a89782f3522598bd431889da506e3cfe72..419ea852493c0830d0f40a64f9bdd30a9babcd70 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/member/MemberService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/member/MemberService.java @@ -38,16 +38,16 @@ public interface MemberService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBrandService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBrandService.java index 2395681af34f14ec1dcac85be22ec5565779a4e9..11287f3b3b4b4d266306e941446188cc4b766153 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBrandService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductBrandService.java @@ -47,16 +47,16 @@ public interface ProductBrandService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryService.java index ca2f41845bf0551c940f99dd11bce2f579a6aab4..a7a006fc59e0aa0d192273004300934abf5a0d16 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductCategoryService.java @@ -11,7 +11,7 @@ import java.util.List; public interface ProductCategoryService extends BaseMpService { /** - * 查询全部类目信息 + * 查询全部分类信息 * * @return */ @@ -35,16 +35,16 @@ public interface ProductCategoryService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyRelationService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyRelationService.java index c91bb45f18b57981b5070902d2920ee13f06bffe..2c5c62692c5549cfc589df6d6691124c75f9afa0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyRelationService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductPropertyRelationService.java @@ -24,21 +24,21 @@ public interface ProductPropertyRelationService extends BaseMpService { @@ -38,16 +37,16 @@ public interface ProductPropertyService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 @@ -65,7 +64,7 @@ public interface ProductPropertyService extends BaseMpService { void update(UpdateProductPropertyVo vo); /** - * 根据类目ID查询 + * 根据分类ID查询 * * @param categoryId * @return diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductService.java index 4c9d4d375f6a3f2cdfd8f15a9e529315c9487433..e1e8f9d8506cbcccdad429597f2680f80490cef3 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/product/ProductService.java @@ -59,7 +59,7 @@ public interface ProductService extends BaseMpService { List getIdNotInProductProperty(String propertyId); /** - * 根据类目ID查询 + * 根据分类ID查询 * * @param categoryId * @return @@ -96,7 +96,7 @@ public interface ProductService extends BaseMpService { void update(UpdateProductVo vo); /** - * 根据类目ID查询 + * 根据分类ID查询 * * @param categoryIds * @return diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/storecenter/StoreCenterService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/storecenter/StoreCenterService.java index 98874304f0a2c195ec71692090b6ec18e29b100a..0eee69dee7cea0218a71a767429c8665588cc0f8 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/storecenter/StoreCenterService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/storecenter/StoreCenterService.java @@ -7,7 +7,6 @@ import com.lframework.xingyun.basedata.vo.storecenter.CreateStoreCenterVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterSelectorVo; import com.lframework.xingyun.basedata.vo.storecenter.QueryStoreCenterVo; import com.lframework.xingyun.basedata.vo.storecenter.UpdateStoreCenterVo; -import java.util.Collection; public interface StoreCenterService extends BaseMpService { @@ -29,16 +28,16 @@ public interface StoreCenterService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/supplier/SupplierService.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/supplier/SupplierService.java index ea7490e52799a0c390ce90a951b989622bd19a24..d9b6784c0d920f37ff8eac82e48f45bdc67ed6a0 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/supplier/SupplierService.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/service/supplier/SupplierService.java @@ -38,16 +38,16 @@ public interface SupplierService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/CreateCustomerVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/CreateCustomerVo.java index a4646d13cee3a6ff8b167d0ce5f7578d54f6a7e3..9965a38b67b474e71e4a5e3a1a66056e039cf20e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/CreateCustomerVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/CreateCustomerVo.java @@ -32,10 +32,10 @@ public class CreateCustomerVo implements BaseVo, Serializable { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty(value = "助记码", required = true) - @NotBlank(message = "请输入助记码！") + @ApiModelProperty(value = "简码", required = true) + @NotBlank(message = "请输入简码！") private String mnemonicCode; /** @@ -82,11 +82,11 @@ public class CreateCustomerVo implements BaseVo, Serializable { private String address; /** - * 结账方式 + * 结算方式 */ - @ApiModelProperty(value = "结账方式", required = true) - @NotNull(message = "请选择结账方式！") - @IsEnum(message = "请选择结账方式！", enumClass = SettleType.class) + @ApiModelProperty(value = "结算方式", required = true) + @NotNull(message = "请选择结算方式！") + @IsEnum(message = "请选择结算方式！", enumClass = SettleType.class) private Integer settleType; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/UpdateCustomerVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/UpdateCustomerVo.java index fe42f590b95bbe4a099e0ed0e694b266bbec9dac..af755d40bef7d094ed0b4a52f1761d782a22be83 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/UpdateCustomerVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/customer/UpdateCustomerVo.java @@ -37,10 +37,10 @@ public class UpdateCustomerVo implements BaseVo, Serializable { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty(value = "助记码", required = true) - @NotBlank(message = "请输入助记码！") + @ApiModelProperty(value = "简码", required = true) + @NotBlank(message = "请输入简码！") private String mnemonicCode; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/CreateMemberVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/CreateMemberVo.java index bc555fb7526f9325b6a4ae8e9dae6d5772a75f79..e5742e0822bb4fbbd4b53940d5dd2fca4d55fd0f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/CreateMemberVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/CreateMemberVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.member; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import com.lframework.starter.web.components.validation.IsCode; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/UpdateMemberVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/UpdateMemberVo.java index 75563018b536cf91893049cdbb91129e11405ad2..bbab90bbc2dc2eec73b4030e5015142e680f610b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/UpdateMemberVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/member/UpdateMemberVo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.basedata.vo.member; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import com.lframework.starter.web.components.validation.IsCode; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/CreateProductVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/CreateProductVo.java index 5debcde7e10bd6df69d0b0b28128b91ec166eff8..6c8ff04d8a0efd9456d7a008468660cddc003011 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/CreateProductVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/CreateProductVo.java @@ -49,16 +49,16 @@ public class CreateProductVo implements BaseVo, Serializable { private String skuCode; /** - * 外部编号 + * 简码 */ - @ApiModelProperty("外部编号") + @ApiModelProperty("简码") private String externalCode; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") - @NotBlank(message = "类目ID不能为空！") + @ApiModelProperty("分类ID") + @NotBlank(message = "分类ID不能为空！") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductSelectorVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductSelectorVo.java index 0bb4a6ce71eb30814224e4a6c27f0c1dd8cb9548..af3dcd385678c636dc675e9efff29b275a82835f 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductSelectorVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductSelectorVo.java @@ -45,9 +45,9 @@ public class QueryProductSelectorVo extends PageVo implements BaseVo, Serializab private String brandId; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductVo.java index d1be1ee5ffbf3ac112f6aff5610cd3110bbdfdfb..ff776da3cd57b7c7fe9d388ed78cf9a52dc55c86 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/QueryProductVo.java @@ -45,9 +45,9 @@ public class QueryProductVo extends SortPageVo implements BaseVo, Serializable { private String brandId; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/UpdateProductVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/UpdateProductVo.java index 8c6920eba9bf96a0ff86e4e456b3cd93e1e23410..818351c6b5ea1f9f19093b5b77efefdd08dd5397 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/UpdateProductVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/info/UpdateProductVo.java @@ -56,16 +56,16 @@ public class UpdateProductVo implements BaseVo, Serializable { private String skuCode; /** - * 外部编号 + * 简码 */ - @ApiModelProperty("外部编号") + @ApiModelProperty("简码") private String externalCode; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") - @NotBlank(message = "类目ID不能为空！") + @ApiModelProperty("分类ID") + @NotBlank(message = "分类ID不能为空！") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/CreateProductPolyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/CreateProductPolyVo.java index 966f15fdfcc8e8be1316b89b7f64f0535567c05e..b2253e5c65d20f30ed4442ce7881d285f57a55dc 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/CreateProductPolyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/CreateProductPolyVo.java @@ -45,10 +45,10 @@ public class CreateProductPolyVo implements BaseVo, Serializable { private String shortName; /** - * 类目ID + * 分类ID */ - @ApiModelProperty(value = "类目ID", required = true) - @NotBlank(message = "请选择商品类目！") + @ApiModelProperty(value = "分类ID", required = true) + @NotBlank(message = "请选择商品分类！") private String categoryId; /** @@ -188,7 +188,7 @@ public class CreateProductPolyVo implements BaseVo, Serializable { private String skuCode; /** - * 外部编号 + * 简码 */ private String externalCode; diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/QueryProductPolyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/QueryProductPolyVo.java index 8a7db852ac69ddd9f99f775cf0efb6760d512e08..8b0521c91a5c38907006c7d00cb43b5274f8fcde 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/QueryProductPolyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/QueryProductPolyVo.java @@ -24,9 +24,9 @@ public class QueryProductPolyVo extends PageVo implements BaseVo, Serializable { private String name; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/UpdateProductPolyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/UpdateProductPolyVo.java index 70862724b958e89bb9538c2fbf14b150cf19d9db..0b15f220ff722ea412aef2d706f4bf4949007b16 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/UpdateProductPolyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/poly/UpdateProductPolyVo.java @@ -47,10 +47,10 @@ public class UpdateProductPolyVo implements BaseVo, Serializable { private String shortName; /** - * 类目ID + * 分类ID */ - @ApiModelProperty(value = "类目ID", required = true) - @NotBlank(message = "请选择商品类目！") + @ApiModelProperty(value = "分类ID", required = true) + @NotBlank(message = "请选择商品分类！") private String categoryId; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/CreateProductPropertyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/CreateProductPropertyVo.java index 76591887364633dba2a27ef146f435c538ae8216..6f66c3d5100bd61938cceda4c04b5ce30a971d4b 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/CreateProductPropertyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/CreateProductPropertyVo.java @@ -64,9 +64,9 @@ public class CreateProductPropertyVo implements BaseVo, Serializable { private Integer propertyType; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private List categoryIds; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/UpdateProductPropertyVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/UpdateProductPropertyVo.java index 98fa4f91caae55a5f23db4043350610b31a0882c..dcdb190d38db0c8be08f86ba7976d4f9b091f422 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/UpdateProductPropertyVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/product/property/UpdateProductPropertyVo.java @@ -71,9 +71,9 @@ public class UpdateProductPropertyVo implements BaseVo, Serializable { private Integer propertyType; /** - * 类目ID + * 分类ID */ - @ApiModelProperty("类目ID") + @ApiModelProperty("分类ID") private List categoryIds; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/CreateSupplierVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/CreateSupplierVo.java index 86874d92f3addca3fa4795d6d6f15d3f9cfc3a90..c25394dddf10af694b248023408c182e296cf371 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/CreateSupplierVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/CreateSupplierVo.java @@ -34,10 +34,10 @@ public class CreateSupplierVo implements BaseVo, Serializable { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty(value = "助记码", required = true) - @NotBlank(message = "请输入助记码！") + @ApiModelProperty(value = "简码", required = true) + @NotBlank(message = "请输入简码！") private String mnemonicCode; /** @@ -99,11 +99,11 @@ public class CreateSupplierVo implements BaseVo, Serializable { private Integer manageType; /** - * 结账方式 + * 结算方式 */ - @ApiModelProperty(value = "结账方式", required = true) - @NotNull(message = "请选择结账方式！") - @IsEnum(message = "请选择结账方式！", enumClass = SettleType.class) + @ApiModelProperty(value = "结算方式", required = true) + @NotNull(message = "请选择结算方式！") + @IsEnum(message = "请选择结算方式！", enumClass = SettleType.class) private Integer settleType; /** diff --git a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/UpdateSupplierVo.java b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/UpdateSupplierVo.java index f5f2b4fcd4f09eda01156362c6cc9637bae5f92a..bb02faa4223ec8045db4f39d904ace2b7a0c032e 100644 --- a/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/UpdateSupplierVo.java +++ b/xingyun-basedata/src/main/java/com/lframework/xingyun/basedata/vo/supplier/UpdateSupplierVo.java @@ -38,10 +38,10 @@ public class UpdateSupplierVo implements BaseVo, Serializable { private String name; /** - * 助记码 + * 简码 */ - @ApiModelProperty(value = "助记码", required = true) - @NotBlank(message = "请输入助记码！") + @ApiModelProperty(value = "简码", required = true) + @NotBlank(message = "请输入简码！") private String mnemonicCode; /** diff --git a/xingyun-basedata/src/main/resources/mappers/product/ProductPropertyRelationMapper.xml b/xingyun-basedata/src/main/resources/mappers/product/ProductPropertyRelationMapper.xml index ab2e925e5358368622747fe485a5c56b76d4ed55..e1a8e0b78834587faa9c1207732bf0ea444d4d51 100644 --- a/xingyun-basedata/src/main/resources/mappers/product/ProductPropertyRelationMapper.xml +++ b/xingyun-basedata/src/main/resources/mappers/product/ProductPropertyRelationMapper.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + SELECT pp.id, pp.product_id, @@ -26,15 +26,15 @@ LEFT JOIN base_data_product_property_item AS t ON t.id = pp.property_item_id - DELETE FROM base_data_product_poly_property WHERE property_id = #{propertyId} AND poly_id NOT IN (SELECT id from base_data_product_poly WHERE category_id = #{categoryId}) + DELETE FROM base_data_product_property_relation WHERE property_id = #{propertyId} AND product_id NOT IN (SELECT id from base_data_product WHERE category_id = #{categoryId}) - + WHERE pp.product_id = #{productId} ORDER BY p.code, t.code - + WHERE pp.property_id = #{propertyId} ORDER BY p.code, t.code diff --git a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/OrderDataListener.java b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java similarity index 44% rename from xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/OrderDataListener.java rename to xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java index f5f35be8113cb73d0a810dba2463ef7eba387e1c..17b74e7db675ccb8e5c1c49613183ef0b083bdc9 100644 --- a/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/OrderDataListener.java +++ b/xingyun-chart/src/main/java/com/lframework/xingyun/chart/listeners/mq/OrderDataToChartListener.java @@ -1,24 +1,33 @@ -package com.lframework.xingyun.chart.listeners; +package com.lframework.xingyun.chart.listeners.mq; import com.lframework.xingyun.chart.enums.OrderChartBizType; import com.lframework.xingyun.chart.service.OrderChartService; import com.lframework.xingyun.chart.vo.CreateOrderChartVo; -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; +import com.lframework.xingyun.core.dto.order.ApprovePassOrderDto; +import com.lframework.xingyun.core.queue.MqStringPool; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; +import org.springframework.messaging.Message; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; @Slf4j @Component -public class OrderDataListener implements ApplicationListener { +public class OrderDataToChartListener { @Autowired private OrderChartService orderChartService; - @Override - public void onApplicationEvent(ApprovePassOrderEvent event) { - + @Transactional(rollbackFor = Exception.class) + @RabbitListener(bindings = { + @QueueBinding(value = @Queue(value = "chart.approve_pass_order"), exchange = @Exchange(value = MqStringPool.APPROVE_PASS_ORDER_EXCHANGE, type = ExchangeTypes.FANOUT))}) + public void execute(Message message) { + ApprovePassOrderDto event = message.getPayload(); OrderChartBizType bizType = this.convertBizType(event.getOrderType()); if (event.getOrderType() == null) { log.error("orderType={}，无法匹配业务类型", event.getOrderType()); @@ -33,24 +42,24 @@ public class OrderDataListener implements ApplicationListener 4.0.0 - xingyun-common + xingyun-comp 【${project.artifactId}】公共组件服务层 @@ -17,6 +17,10 @@ com.lframework xingyun-core + + com.lframework + xingyun-sys + \ No newline at end of file diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/MapLocationBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java similarity index 87% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/MapLocationBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java index d114bcd6199fa6fca41c69a918925fcd6e55da48..002295a69f1f3483a7898a38438e3aae329c4d3e 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/MapLocationBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/MapLocationBo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.bo.components; +package com.lframework.xingyun.comp.bo.components; import com.lframework.starter.web.bo.BaseBo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/OrderTimeLineBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java similarity index 95% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/OrderTimeLineBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java index 79bb7d4614682ece0c055fc898adc833d64d7ade..26dd46947902b0f7dce85c79878d20d558ef0f32 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/components/OrderTimeLineBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/components/OrderTimeLineBo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.bo.components; +package com.lframework.xingyun.comp.bo.components; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/dic/CitySelectorBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java similarity index 92% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/dic/CitySelectorBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java index 2a28b5cc765506158be86f83bd1f36e354a273f4..d95bf6bad312a5d0cb76a225e922e3c66e3a3cd9 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/dic/CitySelectorBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/dic/CitySelectorBo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.bo.dic; +package com.lframework.xingyun.comp.bo.dic; import com.lframework.starter.web.bo.BaseBo; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/GetOnlineExcelBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java similarity index 91% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/GetOnlineExcelBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java index 688dffef6f4dfb9e45cb93c0365f83bf20f6911d..bd5e112a7cdf602c84bb2f0e87099433a644d231 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/GetOnlineExcelBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/GetOnlineExcelBo.java @@ -1,9 +1,9 @@ -package com.lframework.xingyun.common.bo.sw.excel; +package com.lframework.xingyun.comp.bo.sw.excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.core.entity.OnlineExcel; +import com.lframework.xingyun.comp.entity.OnlineExcel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/QueryOnlineExcelBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java similarity index 91% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/QueryOnlineExcelBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java index 984e600be65487d60965ad4a6b1c2a781e0ef294..65970926567b937e713776925ecfa21ef81c5830 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/excel/QueryOnlineExcelBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/excel/QueryOnlineExcelBo.java @@ -1,9 +1,9 @@ -package com.lframework.xingyun.common.bo.sw.excel; +package com.lframework.xingyun.comp.bo.sw.excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.core.entity.OnlineExcel; +import com.lframework.xingyun.comp.entity.OnlineExcel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/GetFileBoxBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java similarity index 92% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/GetFileBoxBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java index de6d7ed0c5c036d3ca8f82719959025d431a3098..8fbf078f2c6560f54ad897ed66476c3e0c36383d 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/GetFileBoxBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/GetFileBoxBo.java @@ -1,10 +1,10 @@ -package com.lframework.xingyun.common.bo.sw.filebox; +package com.lframework.xingyun.comp.bo.sw.filebox; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.core.entity.FileBox; +import com.lframework.xingyun.comp.entity.FileBox; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/QueryFileBoxBo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java similarity index 84% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/QueryFileBoxBo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java index abf11eabcbbdfd6cd15fdfafeac0bfcf6691bb64..e9334b2beebd7bb293617ab4a6bd19d502833913 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/bo/sw/filebox/QueryFileBoxBo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/bo/sw/filebox/QueryFileBoxBo.java @@ -1,9 +1,8 @@ -package com.lframework.xingyun.common.bo.sw.filebox; +package com.lframework.xingyun.comp.bo.sw.filebox; -import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.core.entity.FileBox; +import com.lframework.xingyun.comp.entity.FileBox; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/SelectorController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java similarity index 93% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/controller/SelectorController.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java index 6d0975066103eccc0eede4054536bbdecebbfb59..eb933aa647357788b7dbcc17331dfe777a474a21 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/SelectorController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/SelectorController.java @@ -1,10 +1,10 @@ -package com.lframework.xingyun.common.controller; +package com.lframework.xingyun.comp.controller; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.xingyun.common.bo.dic.CitySelectorBo; +import com.lframework.xingyun.comp.bo.dic.CitySelectorBo; import com.lframework.xingyun.core.dto.dic.city.DicCityDto; import com.lframework.xingyun.core.service.DicCityService; import io.swagger.annotations.Api; diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/components/ComponentController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java similarity index 86% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/controller/components/ComponentController.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java index e844dda1eda7559af8698ee849c7e1ca726b5222..fb2923208c913d92b2dc8ff7d34b6a456c188b72 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/components/ComponentController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/components/ComponentController.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.controller.components; +package com.lframework.xingyun.comp.controller.components; import cn.hutool.crypto.SecureUtil; import com.lframework.starter.common.constants.StringPool; @@ -10,15 +10,16 @@ import com.lframework.starter.web.bo.ExcelImportBo; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.service.SysParameterService; +import com.lframework.starter.web.service.SysConfService; import com.lframework.starter.web.utils.ExcelImportUtil; import com.lframework.starter.web.utils.HttpUtil; import com.lframework.starter.web.utils.JsonUtil; import com.lframework.starter.web.utils.UploadUtil; -import com.lframework.xingyun.common.bo.components.MapLocationBo; -import com.lframework.xingyun.common.bo.components.OrderTimeLineBo; +import com.lframework.xingyun.comp.bo.components.MapLocationBo; +import com.lframework.xingyun.comp.bo.components.OrderTimeLineBo; import com.lframework.xingyun.core.entity.OrderTimeLine; import com.lframework.xingyun.core.service.OrderTimeLineService; +import com.lframework.xingyun.core.service.GenerateCodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -29,6 +30,7 @@ import java.util.Map; import java.util.stream.Collectors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -49,11 +51,14 @@ import org.springframework.web.multipart.MultipartFile; public class ComponentController extends DefaultBaseController { @Autowired - private SysParameterService sysParameterService; + private SysConfService sysConfService; @Autowired private OrderTimeLineService orderTimeLineService; + @Autowired + private GenerateCodeService generateCodeService; + @ApiOperation("查询导入Excel任务") @GetMapping("/import/task") public InvokeResult getExcelImportTask(@NotBlank(message = "ID不能为空！") String id) { @@ -64,7 +69,7 @@ public class ComponentController extends DefaultBaseController { @ApiOperation("获取地图Key") @GetMapping("/map/key") public InvokeResult getMapKey() { - String key = sysParameterService.findRequiredByKey("tx-map.key"); + String key = sysConfService.findRequiredByKey("tx-map.key"); return InvokeResultBuilder.success(key); } @@ -73,8 +78,8 @@ public class ComponentController extends DefaultBaseController { @GetMapping("/map/location") public InvokeResult getMapLocation(@NotEmpty(message = "地址不能为空！") String address) { - String key = sysParameterService.findRequiredByKey("tx-map.key"); - String secret = sysParameterService.findRequiredByKey("tx-map.secret"); + String key = sysConfService.findRequiredByKey("tx-map.key"); + String secret = sysConfService.findRequiredByKey("tx-map.secret"); // 请求腾讯地图WebService Api // Api文档地址：https://lbs.qq.com/service/webService/webServiceGuide/webServiceGeocoder @@ -150,4 +155,10 @@ public class ComponentController extends DefaultBaseController { return InvokeResultBuilder.success(url); } + + @ApiOperation("获取编号") + @GetMapping("/generate/code") + public InvokeResult generateCode(@NotNull(message = "编号类型不能为空！") Integer type) { + return InvokeResultBuilder.success(generateCodeService.generate(type)); + } } diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/FileBoxController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java similarity index 33% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/FileBoxController.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java index 1833891aa5f1ede9b02a8ab776d484030350cf6f..484b0809a2afbf1b31a1c66d47ecdf4090da129c 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/FileBoxController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/FileBoxController.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.controller.sw; +package com.lframework.xingyun.comp.controller.sw; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; @@ -7,14 +7,14 @@ import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.common.bo.sw.filebox.GetFileBoxBo; -import com.lframework.xingyun.common.bo.sw.filebox.QueryFileBoxBo; -import com.lframework.xingyun.core.entity.FileBox; -import com.lframework.xingyun.core.service.FileBoxService; -import com.lframework.xingyun.core.vo.sw.filebox.CreateFileBoxDirVo; -import com.lframework.xingyun.core.vo.sw.filebox.QueryFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UpdateFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UploadFileBoxVo; +import com.lframework.xingyun.comp.bo.sw.filebox.GetFileBoxBo; +import com.lframework.xingyun.comp.bo.sw.filebox.QueryFileBoxBo; +import com.lframework.xingyun.comp.entity.FileBox; +import com.lframework.xingyun.comp.service.FileBoxService; +import com.lframework.xingyun.comp.vo.sw.filebox.CreateFileBoxDirVo; +import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UpdateFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UploadFileBoxVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -22,13 +22,13 @@ import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -41,84 +41,84 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/sw/filebox") public class FileBoxController extends DefaultBaseController { - @Autowired - private FileBoxService fileBoxService; + @Autowired + private FileBoxService fileBoxService; - @ApiOperation("创建文件夹") - @PostMapping("/dir") - public InvokeResult createDir(@Valid CreateFileBoxDirVo vo) { + @ApiOperation("创建文件夹") + @PostMapping("/dir") + public InvokeResult createDir(@Valid CreateFileBoxDirVo vo) { - fileBoxService.createDir(vo); + fileBoxService.createDir(vo); - return InvokeResultBuilder.success(); - } - - /** - * 上传文件 - */ - @ApiOperation("上传文件") - @PostMapping("/upload") - public InvokeResult upload(@Valid UploadFileBoxVo vo) { + return InvokeResultBuilder.success(); + } - fileBoxService.upload(vo); + /** + * 上传文件 + */ + @ApiOperation("上传文件") + @PostMapping("/upload") + public InvokeResult upload(@Valid UploadFileBoxVo vo) { - return InvokeResultBuilder.success(); - } + fileBoxService.upload(vo); - /** - * 查询列表 - */ - @ApiOperation("查询列表") - @GetMapping("/query") - public InvokeResult> query(@Valid QueryFileBoxVo vo) { + return InvokeResultBuilder.success(); + } - PageResult pageResult = fileBoxService.query(getPageIndex(vo), getPageSize(vo), - vo); + /** + * 查询列表 + */ + @ApiOperation("查询列表") + @GetMapping("/query") + public InvokeResult> query(@Valid QueryFileBoxVo vo) { - List datas = pageResult.getDatas(); - List results = null; + PageResult pageResult = fileBoxService.query(getPageIndex(vo), getPageSize(vo), + vo); - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QueryFileBoxBo::new).collect(Collectors.toList()); - } + List datas = pageResult.getDatas(); + List results = null; - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QueryFileBoxBo::new).collect(Collectors.toList()); } - /** - * 根据ID查询 - */ - @ApiOperation("根据ID查询") - @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) - @GetMapping - public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { - - FileBox data = fileBoxService.findById(id); - if (data == null) { - throw new DefaultClientException("文件收纳箱不存在！"); - } + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } - GetFileBoxBo result = new GetFileBoxBo(data); + /** + * 根据ID查询 + */ + @ApiOperation("根据ID查询") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @GetMapping + public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { - return InvokeResultBuilder.success(result); + FileBox data = fileBoxService.findById(id); + if (data == null) { + throw new DefaultClientException("文件收纳箱不存在！"); } - /** - * 修改 - */ - @ApiOperation("修改") - @PutMapping - public InvokeResult update(@Valid UpdateFileBoxVo vo) { + GetFileBoxBo result = new GetFileBoxBo(data); - fileBoxService.update(vo); + return InvokeResultBuilder.success(result); + } - return InvokeResultBuilder.success(); - } + /** + * 修改 + */ + @ApiOperation("修改") + @PutMapping + public InvokeResult update(@Valid UpdateFileBoxVo vo) { - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete(@RequestBody List ids) { - fileBoxService.batchDelete(ids); - return InvokeResultBuilder.success(); - } + fileBoxService.update(vo); + + return InvokeResultBuilder.success(); + } + + @ApiOperation("删除") + @DeleteMapping + public InvokeResult deleteById(@NotEmpty(message = "ID不能为空！") String id) { + fileBoxService.deleteById(id); + return InvokeResultBuilder.success(); + } } diff --git a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/OnlineExcelController.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java similarity index 85% rename from xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/OnlineExcelController.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java index 496429cbc677618a4287a3c2ea7157ebec6bbada..681bbe2ae79c8af22c5acc22dc871615d379dc0d 100644 --- a/xingyun-common/src/main/java/com/lframework/xingyun/common/controller/sw/OnlineExcelController.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/controller/sw/OnlineExcelController.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.common.controller.sw; +package com.lframework.xingyun.comp.controller.sw; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; @@ -7,17 +7,17 @@ import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.xingyun.common.bo.sw.excel.GetOnlineExcelBo; -import com.lframework.xingyun.common.bo.sw.excel.QueryOnlineExcelBo; -import com.lframework.xingyun.core.entity.OnlineExcel; -import com.lframework.xingyun.core.service.OnlineExcelService; -import com.lframework.xingyun.core.vo.sw.excel.BatchSendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.CreateOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.QueryOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.SendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelContentVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelVo; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.xingyun.comp.bo.sw.excel.GetOnlineExcelBo; +import com.lframework.xingyun.comp.bo.sw.excel.QueryOnlineExcelBo; +import com.lframework.xingyun.comp.entity.OnlineExcel; +import com.lframework.xingyun.comp.service.OnlineExcelService; +import com.lframework.xingyun.comp.vo.sw.excel.BatchSendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.CreateOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.QueryOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.SendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelContentVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/FileBox.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java similarity index 94% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/entity/FileBox.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java index 95f7db1fbf80b401e9df8b9e1775b4019fc98da4..99cce6ab802aff808f9b4c51cb2f52c67e382a8b 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/FileBox.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/FileBox.java @@ -1,11 +1,11 @@ -package com.lframework.xingyun.core.entity; +package com.lframework.xingyun.comp.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; -import com.lframework.xingyun.core.enums.FileBoxFileType; +import com.lframework.xingyun.comp.enums.FileBoxFileType; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OnlineExcel.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java similarity index 97% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OnlineExcel.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java index 8d50fce806f9245905c00a25151345bc1b14a6c0..d13e84b05de108a52a57b7e4b1c56cbfaada78db 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OnlineExcel.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/entity/OnlineExcel.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.entity; +package com.lframework.xingyun.comp.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxFileType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java similarity index 92% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxFileType.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java index c338ae878a9f3e247d0bc3b407b16396a079b624..1048641938075d56645d3449411f6abc51f5400a 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxFileType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxFileType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.enums; +package com.lframework.xingyun.comp.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxNodeType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java similarity index 77% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxNodeType.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java index 4e08ff07f594b2ffce798da836871111fbe0d649..fed1064d842a10ac6d0c9270a8bc89a0f9c48839 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/FileBoxNodeType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/FileBoxNodeType.java @@ -1,6 +1,6 @@ -package com.lframework.xingyun.core.enums; +package com.lframework.xingyun.comp.enums; -import com.lframework.xingyun.template.core.enums.NodeType; +import com.lframework.xingyun.core.enums.NodeType; import java.io.Serializable; import org.springframework.stereotype.Component; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/SwOpLogType.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java similarity index 63% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/enums/SwOpLogType.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java index e7ff7809f773fe232ebfc803053021d53bceff42..44fef8175998729f5eb249531e1201c03b9ff8ba 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/SwOpLogType.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/enums/SwOpLogType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.enums; +package com.lframework.xingyun.comp.enums; public interface SwOpLogType { diff --git a/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/FileBoxServiceImpl.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/FileBoxServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..fe535fffe92bc542320e90744fe3c0a3213ec7cd --- /dev/null +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/FileBoxServiceImpl.java @@ -0,0 +1,213 @@ +package com.lframework.xingyun.comp.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.common.utils.FileUtil; +import com.lframework.starter.common.utils.ObjectUtil; +import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.web.utils.UploadUtil; +import com.lframework.xingyun.comp.entity.FileBox; +import com.lframework.xingyun.comp.enums.FileBoxFileType; +import com.lframework.xingyun.comp.enums.FileBoxNodeType; +import com.lframework.xingyun.comp.enums.SwOpLogType; +import com.lframework.xingyun.comp.mappers.FileBoxMapper; +import com.lframework.xingyun.comp.service.FileBoxService; +import com.lframework.xingyun.comp.vo.sw.filebox.CreateFileBoxDirVo; +import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UpdateFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UploadFileBoxVo; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.utils.OpLogUtil; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class FileBoxServiceImpl extends + BaseMpServiceImpl implements FileBoxService { + + @Autowired + private RecursionMappingService recursionMappingService; + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, QueryFileBoxVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QueryFileBoxVo vo) { + + return getBaseMapper().query(vo, SecurityUtil.getCurrentUser().getId()); + } + + @Override + public FileBox findById(String id) { + + return getBaseMapper().selectById(id); + } + + @OpLog(type = SwOpLogType.SW, name = "修改文件，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateFileBoxVo vo) { + + FileBox data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("文件或文件夹不存在！"); + } + + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(FileBox.class) + .set(data.getFileType() != FileBoxFileType.DIR, FileBox::getName, vo.getName()) + .set(FileBox::getDescription, + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR + : vo.getDescription()) + .eq(FileBox::getId, vo.getId()); + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", data.getId()); + OpLogUtil.setExtra(vo); + } + + @OpLog(type = SwOpLogType.SW, name = "删除文件，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(String id) { + + List delIds = new ArrayList<>(); + delIds.add(id); + + List childIds = recursionMappingService.getNodeChildIds(id, + ApplicationUtil.getBean(FileBoxNodeType.class)); + delIds.addAll(childIds); + + recursionMappingService.deleteNodeAndChildren(id, + ApplicationUtil.getBean(FileBoxNodeType.class)); + + Wrapper deleteWrapper = Wrappers.lambdaQuery(FileBox.class) + .in(FileBox::getId, delIds) + .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); + this.remove(deleteWrapper); + } + + @OpLog(type = SwOpLogType.SW, name = "创建文件夹，父级目录：{}，文件夹名称：{}", params = { + "#vo.parentPath", "#vo.name"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void createDir(CreateFileBoxDirVo vo) { + + Wrapper checkWrapper = Wrappers.lambdaQuery(FileBox.class) + .eq(FileBox::getName, vo.getName()).eq(FileBox::getFilePath, vo.getParentPath()) + .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); + if (this.count(checkWrapper) > 0) { + throw new DefaultClientException("文件夹名称重复，请重新输入！"); + } + FileBox dir = new FileBox(); + dir.setId(IdUtil.getId()); + dir.setName(vo.getName()); + dir.setFileType(FileBoxFileType.DIR); + dir.setFilePath(vo.getParentPath()); + dir.setDescription(StringPool.EMPTY_STR); + + this.save(dir); + + if ("/".equals(vo.getParentPath())) { + recursionMappingService.saveNode(dir.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class)); + } else { + String path = vo.getParentPath().substring(0, + vo.getParentPath().lastIndexOf("/") == 0 ? 1 : vo.getParentPath().lastIndexOf("/")); + String name = vo.getParentPath().substring(vo.getParentPath().lastIndexOf("/") + 1); + + Wrapper queryWrapper = Wrappers.lambdaQuery(FileBox.class) + .eq(FileBox::getName, name).eq(FileBox::getFilePath, path) + .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); + FileBox fileBox = this.getOne(queryWrapper); + if (fileBox == null) { + throw new DefaultClientException("父级目录不存在！"); + } + + List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class)); + parentIds.add(fileBox.getId()); + + recursionMappingService.saveNode(dir.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); + } + } + + @OpLog(type = SwOpLogType.SW, name = "上传文件，父级目录：{}，文件名称：{}", params = { + "#vo.path", "#vo.name"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void upload(UploadFileBoxVo vo) { + MultipartFile file = vo.getFile(); + String url = UploadUtil.upload(file); + + FileBox record = new FileBox(); + record.setId(IdUtil.getId()); + record.setName(file.getOriginalFilename()); + record.setUrl(url); + record.setContentType(file.getContentType()); + record.setFileType(FileBoxFileType.FILE); + record.setFileSize(FileUtil.readableFileSize(file.getSize())); + record.setFilePath(vo.getPath()); + record.setFileSuffix(FileUtil.getSuffix(file.getOriginalFilename())); + record.setDescription(StringPool.EMPTY_STR); + + this.save(record); + + if ("/".equals(vo.getPath())) { + recursionMappingService.saveNode(record.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class)); + } else { + String path = vo.getPath() + .substring(0, vo.getPath().lastIndexOf("/") == 0 ? 1 : vo.getPath().lastIndexOf("/")); + String name = vo.getPath().substring(vo.getPath().lastIndexOf("/") + 1); + + Wrapper queryWrapper = Wrappers.lambdaQuery(FileBox.class) + .eq(FileBox::getName, name).eq(FileBox::getFilePath, path) + .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); + FileBox fileBox = this.getOne(queryWrapper); + if (fileBox == null) { + throw new DefaultClientException("父级目录不存在！"); + } + + List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class)); + parentIds.add(fileBox.getId()); + + recursionMappingService.saveNode(record.getId(), + ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); + } + } + + @Override + public void cleanCacheByKey(Serializable key) { + + } +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OnlineExcelServiceImpl.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java similarity index 84% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OnlineExcelServiceImpl.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java index 22a4c251cc3ebef9c5e3a1b122ab6690a7193b35..4f3811fd775acace721ae8aba87d1a0c69827fbb 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OnlineExcelServiceImpl.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/impl/OnlineExcelServiceImpl.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.impl; +package com.lframework.xingyun.comp.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -8,27 +8,27 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.JsonUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.entity.OnlineExcel; -import com.lframework.xingyun.core.enums.SwOpLogType; -import com.lframework.xingyun.core.mappers.OnlineExcelMapper; -import com.lframework.xingyun.core.service.OnlineExcelService; -import com.lframework.xingyun.core.vo.sw.excel.BatchSendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.CreateOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.QueryOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.SendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelContentVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.dto.UserDto; -import com.lframework.xingyun.template.core.service.UserService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.comp.entity.OnlineExcel; +import com.lframework.xingyun.comp.mappers.OnlineExcelMapper; +import com.lframework.xingyun.comp.service.OnlineExcelService; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.comp.enums.SwOpLogType; +import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.xingyun.comp.vo.sw.excel.BatchSendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.CreateOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.QueryOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.SendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelContentVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelVo; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -41,7 +41,7 @@ public class OnlineExcelServiceImpl extends BaseMpServiceImpl implements OnlineExcelService { @Autowired - private UserService userService; + private SysUserService userService; @Override public PageResult query(Integer pageIndex, Integer pageSize, QueryOnlineExcelVo vo) { @@ -132,7 +132,8 @@ public class OnlineExcelServiceImpl extends OpLogUtil.setExtra(vo); } - @OpLog(type = SwOpLogType.SW, name = "发送Excel文件，发送方{}, 接收方{}", params = {"#sender", "#receiver"}) + @OpLog(type = SwOpLogType.SW, name = "发送Excel文件，发送方{}, 接收方{}", params = {"#sender", + "#receiver"}) @Transactional(rollbackFor = Exception.class) @Override public void send(SendOnlineExcelVo vo) { @@ -142,7 +143,7 @@ public class OnlineExcelServiceImpl extends throw new DefaultClientException("Excel文件不存在！"); } - UserDto receiver = userService.findById(vo.getUserId()); + SysUser receiver = userService.findById(vo.getUserId()); if (receiver == null) { throw new DefaultClientException("接收方不存在！"); } @@ -171,7 +172,7 @@ public class OnlineExcelServiceImpl extends @Override public void batchSend(BatchSendOnlineExcelVo vo) { - UserDto receiver = userService.findById(vo.getUserId()); + SysUser receiver = userService.findById(vo.getUserId()); if (receiver == null) { throw new DefaultClientException("接收方不存在！"); } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/FileBoxMapper.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java similarity index 71% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/FileBoxMapper.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java index 95ffe051d4c0228bde1616f9e01b7cee92c75070..fe7a01f2fc9cac1c015f879768df0d48b8a47ffc 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/FileBoxMapper.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/FileBoxMapper.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.core.mappers; +package com.lframework.xingyun.comp.mappers; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.entity.FileBox; -import com.lframework.xingyun.core.vo.sw.filebox.QueryFileBoxVo; +import com.lframework.xingyun.comp.entity.FileBox; +import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OnlineExcelMapper.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java similarity index 71% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OnlineExcelMapper.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java index 4f97f1d444cbec6b6bbb2859c5b6ab24ccb424c1..ed5b882f5d71b72afe502983dade1e8d84a4abab 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OnlineExcelMapper.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/mappers/OnlineExcelMapper.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.core.mappers; +package com.lframework.xingyun.comp.mappers; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.core.entity.OnlineExcel; -import com.lframework.xingyun.core.vo.sw.excel.QueryOnlineExcelVo; +import com.lframework.xingyun.comp.entity.OnlineExcel; +import com.lframework.xingyun.comp.vo.sw.excel.QueryOnlineExcelVo; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/FileBoxService.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java similarity index 66% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/service/FileBoxService.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java index 3eb3a87df0825fb2b21071a38466fbb82113e4a2..6bbae09a4b5ff24ea6936a917529c8ed5989d8e3 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/FileBoxService.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/FileBoxService.java @@ -1,12 +1,12 @@ -package com.lframework.xingyun.core.service; +package com.lframework.xingyun.comp.service; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.entity.FileBox; -import com.lframework.xingyun.core.vo.sw.filebox.CreateFileBoxDirVo; -import com.lframework.xingyun.core.vo.sw.filebox.QueryFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UpdateFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UploadFileBoxVo; +import com.lframework.xingyun.comp.entity.FileBox; +import com.lframework.xingyun.comp.vo.sw.filebox.CreateFileBoxDirVo; +import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UpdateFileBoxVo; +import com.lframework.xingyun.comp.vo.sw.filebox.UploadFileBoxVo; import java.util.List; /** @@ -46,10 +46,10 @@ public interface FileBoxService extends BaseMpService { /** - * 批量删除 - * @param ids + * 根据ID删除 + * @param id */ - void batchDelete(List ids); + void deleteById(String id); /** * 创建文件夹 diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OnlineExcelService.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java similarity index 69% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/service/OnlineExcelService.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java index cfc6e450c9bebed85c8a6ad83e8f7c184088e88f..897fed58621d6b8ce75e885059a2543b128f1cef 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OnlineExcelService.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/service/OnlineExcelService.java @@ -1,14 +1,14 @@ -package com.lframework.xingyun.core.service; +package com.lframework.xingyun.comp.service; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.core.entity.OnlineExcel; -import com.lframework.xingyun.core.vo.sw.excel.BatchSendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.CreateOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.QueryOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.SendOnlineExcelVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelContentVo; -import com.lframework.xingyun.core.vo.sw.excel.UpdateOnlineExcelVo; +import com.lframework.xingyun.comp.entity.OnlineExcel; +import com.lframework.xingyun.comp.vo.sw.excel.BatchSendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.CreateOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.QueryOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.SendOnlineExcelVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelContentVo; +import com.lframework.xingyun.comp.vo.sw.excel.UpdateOnlineExcelVo; import java.util.List; /** diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/BatchSendOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java similarity index 95% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/BatchSendOnlineExcelVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java index dbd36bc12f8075ca0f751848fee70dc5afc152bf..b602285453b49a5544cffcc804aa3c56566cb730 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/BatchSendOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/BatchSendOnlineExcelVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/CreateOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java similarity index 93% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/CreateOnlineExcelVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java index 0be8a4c1143e9ff89a9c1d4e525323d3ecf5d251..9fb569037ce22f4b77a0fd65bda589f2b1c605ce 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/CreateOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/CreateOnlineExcelVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/QueryOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java similarity index 95% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/QueryOnlineExcelVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java index 2791baafecc380b25823780ed7bc0178ad4fde1b..3cb2854cc5ebe65d038e9f4f80d621f701f57cf5 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/QueryOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/QueryOnlineExcelVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/SendOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java similarity index 95% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/SendOnlineExcelVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java index 63e0d9de3a8b948b4e901ee6ba3520f6c7efb258..8a3560efd9ade67f6307955a03510dcff707926b 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/SendOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/SendOnlineExcelVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelContentVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java similarity index 92% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelContentVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java index bd2ddfda1e640dc97a8ee0583b78f1069a45c41e..888812d11114c348f51d5803041794e5fa4906a6 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelContentVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelContentVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java similarity index 95% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java index 0ed60376f27d84734b12963a3d6dd4762cccf58e..fb54d0aa1d4b74ea64391d478362c15c7ee067c3 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/excel/UpdateOnlineExcelVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/excel/UpdateOnlineExcelVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.excel; +package com.lframework.xingyun.comp.vo.sw.excel; import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/CreateFileBoxDirVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java similarity index 93% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/CreateFileBoxDirVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java index 06adcb8ab726615a08fe479f19c884c7e6a3c677..21957bd310d473b0fbf36e4cd4c6f87ef7fadda3 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/CreateFileBoxDirVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/CreateFileBoxDirVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.filebox; +package com.lframework.xingyun.comp.vo.sw.filebox; import com.lframework.starter.web.components.validation.Pattern; import com.lframework.starter.web.vo.BaseVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/QueryFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java similarity index 90% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/QueryFileBoxVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java index d2a8086b60feaec896891e8d6a221741819df00b..6f0ed25db9b0f0e3525c574af425592bb9179896 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/QueryFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/QueryFileBoxVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.filebox; +package com.lframework.xingyun.comp.vo.sw.filebox; import com.lframework.starter.web.vo.BaseVo; import com.lframework.starter.web.vo.PageVo; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UpdateFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java similarity index 93% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UpdateFileBoxVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java index 21e2e174e0962191015b2a555270acb6880f9677..7477e1e5bd81aea2d74fe07b12ca5f02bfa651eb 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UpdateFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UpdateFileBoxVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.filebox; +package com.lframework.xingyun.comp.vo.sw.filebox; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UploadFileBoxVo.java b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java similarity index 93% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UploadFileBoxVo.java rename to xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java index a71f40e530a7b55bbded1876608280a37ccb9f01..0e2f07144e4ca5170898f08f5c1aaf02d84b31aa 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/sw/filebox/UploadFileBoxVo.java +++ b/xingyun-comp/src/main/java/com/lframework/xingyun/comp/vo/sw/filebox/UploadFileBoxVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.vo.sw.filebox; +package com.lframework.xingyun.comp.vo.sw.filebox; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-common/src/main/java/lombok.config b/xingyun-comp/src/main/java/lombok.config similarity index 100% rename from xingyun-common/src/main/java/lombok.config rename to xingyun-comp/src/main/java/lombok.config diff --git a/xingyun-core/src/main/resources/mappers/FileBoxMapper.xml b/xingyun-comp/src/main/resources/mappers/FileBoxMapper.xml similarity index 82% rename from xingyun-core/src/main/resources/mappers/FileBoxMapper.xml rename to xingyun-comp/src/main/resources/mappers/FileBoxMapper.xml index d571f695aad96c01d434c06985885240952ddf1a..bed0c3d69724fa930410f8d04f5d8934a18ce1d3 100644 --- a/xingyun-core/src/main/resources/mappers/FileBoxMapper.xml +++ b/xingyun-comp/src/main/resources/mappers/FileBoxMapper.xml @@ -1,9 +1,9 @@ - + - diff --git a/xingyun-core/src/main/resources/mappers/OnlineExcelMapper.xml b/xingyun-comp/src/main/resources/mappers/OnlineExcelMapper.xml similarity index 92% rename from xingyun-core/src/main/resources/mappers/OnlineExcelMapper.xml rename to xingyun-comp/src/main/resources/mappers/OnlineExcelMapper.xml index 2466d18fe08ca4af2737eadec704963ace624d02..11ae7be8fa10a92268a7bb3b2a596a4f5425a007 100644 --- a/xingyun-core/src/main/resources/mappers/OnlineExcelMapper.xml +++ b/xingyun-comp/src/main/resources/mappers/OnlineExcelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/xingyun-core/pom.xml b/xingyun-core/pom.xml index 76d1f331f017ece5330237d3c2a18e3bc828a660..756d9e001fb3429a16bcf42aa4ce39ae9ca46500 100644 --- a/xingyun-core/pom.xml +++ b/xingyun-core/pom.xml @@ -15,11 +15,12 @@ com.lframework - xingyun-template-core + websocket-starter + com.lframework - websocket-starter + rabbitmq-starter diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/OpLog.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java similarity index 95% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/OpLog.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java index 1724e18d786dae486b6dd2a8da21223bc7527357..a2524cc6a23e82086ae9bfd75131e6ef84ac898b 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/OpLog.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OpLog.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.annotations; +package com.lframework.xingyun.core.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annations/OrderTimeLineLog.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java similarity index 96% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/annations/OrderTimeLineLog.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java index 10418eb79f41a6607b9cfa853f7ed2df949d23e4..bc82bcdd1c1dba464ea35d7e3dcfbf5288937a54 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/annations/OrderTimeLineLog.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/OrderTimeLineLog.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.core.annations; +package com.lframework.xingyun.core.annotations; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; import java.lang.annotation.Documented; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermission.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java similarity index 83% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermission.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java index 224c2f997560be7040fbc899a4cd174512124664..0eb45d1bb0a7b59e431cc3264bc3c15e3b910966 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermission.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermission.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.annotations.permission; +package com.lframework.xingyun.core.annotations.permission; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissionGroup.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissionGroup.java new file mode 100644 index 0000000000000000000000000000000000000000..49d1ff69882feb5c564925bb366ada41a0f868f3 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissionGroup.java @@ -0,0 +1,15 @@ +package com.lframework.xingyun.core.annotations.permission; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataPermissionGroup { + + DataPermissions[] value(); +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermissions.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java similarity index 69% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermissions.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java index 0a2a76ef297645c03b94694616e90c4bc9917067..a4c736de78fef8035f32679bbeef65539845128b 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/permission/DataPermissions.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/permission/DataPermissions.java @@ -1,6 +1,6 @@ -package com.lframework.xingyun.template.core.annotations.permission; +package com.lframework.xingyun.core.annotations.permission; -import com.lframework.xingyun.template.core.components.permission.SysDataPermissionDataPermissionType; +import com.lframework.xingyun.core.components.permission.SysDataPermissionDataPermissionType; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sort.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java similarity index 92% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sort.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java index 8e81cfb7e229f9bf0e120489893b3dc6a3f87f66..61b7d03b0b94e6aa0f2ff6d10c13d1111c5d7037 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sort.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sort.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.annotations.sort; +package com.lframework.xingyun.core.annotations.sort; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sorts.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java similarity index 83% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sorts.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java index 89f70acd5f7632d8a8cd8f71b40b5dad52305d91..fd47c5a59d2467d3f54e98299ce4f4f8d53b4ce3 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/annotations/sort/Sorts.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/annotations/sort/Sorts.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.annotations.sort; +package com.lframework.xingyun.core.annotations.sort; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/aop/OpLogAspector.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java similarity index 92% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/aop/OpLogAspector.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java index 9dd0c3d113f2f4a61699655d303becdf6f7f0a23..d6ff27c8342875b8d9356a306389259ba60baa56 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/aop/OpLogAspector.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OpLogAspector.java @@ -1,15 +1,15 @@ -package com.lframework.xingyun.template.core.aop; +package com.lframework.xingyun.core.aop; import com.lframework.starter.common.utils.ArrayUtil; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.SpelUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; +import com.lframework.xingyun.core.vo.CreateOpLogsVo; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -37,7 +37,7 @@ import org.springframework.stereotype.Component; @ConditionalOnProperty(value = "op-logs.enabled", matchIfMissing = true) public class OpLogAspector { - @Pointcut("@annotation(com.lframework.xingyun.template.core.annotations.OpLog)") + @Pointcut("@annotation(com.lframework.xingyun.core.annotations.OpLog)") public void opLogCutPoint() { } @@ -54,6 +54,10 @@ public class OpLogAspector { Object value = joinPoint.proceed(); + if (currentUser == null) { + currentUser = SecurityUtil.getCurrentUser(); + } + if (currentUser != null) { try { //获取方法的参数名和参数值 @@ -178,6 +182,7 @@ public class OpLogAspector { if (CollectionUtil.isNotEmpty(createOpLogsVoList)) { OpLogUtil.addLogs(createOpLogsVoList); } + OpLogUtil.submitLog(currentUser); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OrderTimeLineLogAspect.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OrderTimeLineLogAspect.java index 8ef4f55992ae96543f69c7e62182ac502a398c93..1b67b556fdc097533f27fdfda5e22bcd8bc32893 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OrderTimeLineLogAspect.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/aop/OrderTimeLineLogAspect.java @@ -3,13 +3,13 @@ package com.lframework.xingyun.core.aop; import com.lframework.starter.common.utils.ArrayUtil; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.config.properties.DefaultSettingProperties; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.SpelUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.entity.OrderTimeLine; import com.lframework.xingyun.core.service.OrderTimeLineService; import java.util.ArrayList; @@ -39,9 +39,9 @@ public class OrderTimeLineLogAspect { @Autowired private DefaultSettingProperties defaultSettingProperties; - private final ThreadLocal POOL = new ThreadLocal<>(); + private final ThreadLocal POOL = new InheritableThreadLocal<>(); - @Pointcut("@annotation(com.lframework.xingyun.core.annations.OrderTimeLineLog)") + @Pointcut("@annotation(com.lframework.xingyun.core.annotations.OrderTimeLineLog)") public void orderTimeLineLogCutPoint() { } diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/WebExceptionHandler.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java similarity index 98% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/WebExceptionHandler.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java index 7f951497ac084df80ca8dc6f5ece6c251124ac4a..41b40860f773a3ff19b082c0c539d150a0f2ceb7 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/WebExceptionHandler.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/WebExceptionHandler.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.components; +package com.lframework.xingyun.core.components; import cn.dev33.satoken.exception.NotPermissionException; import com.lframework.starter.common.exceptions.BaseException; @@ -8,7 +8,7 @@ import com.lframework.starter.common.exceptions.impl.AccessDeniedException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.DefaultSysException; import com.lframework.starter.common.exceptions.impl.InputErrorException; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.resp.InvokeResultBuilder; import com.lframework.starter.web.resp.Response; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRule.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRule.java new file mode 100644 index 0000000000000000000000000000000000000000..9585d4df475bcf136056c32143e9cae3d3a5aa7a --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRule.java @@ -0,0 +1,15 @@ +package com.lframework.xingyun.core.components.notify; + +/** + * 消息通知规则 + */ +public interface SysNotifyRule { + + /** + * 根据业务类型匹配 + * + * @param bizType + * @return + */ + boolean match(Integer bizType); +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleEmail.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleEmail.java new file mode 100644 index 0000000000000000000000000000000000000000..cca7648545e927fc6104636187ea087aba421f16 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleEmail.java @@ -0,0 +1,25 @@ +package com.lframework.xingyun.core.components.notify; + +import com.lframework.xingyun.core.dto.notify.SysNotifyParamsDto; + +/** + * 消息通知规则（邮件） + */ +public interface SysNotifyRuleEmail extends SysNotifyRule { + + /** + * 获取标题 + * + * @param params + * @return + */ + String getTitle(SysNotifyParamsDto params); + + /** + * 获取内容 + * + * @param params + * @return + */ + String getContent(SysNotifyParamsDto params); +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleSys.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleSys.java new file mode 100644 index 0000000000000000000000000000000000000000..fe845dfa799a30c85a58face02000c41394bb5ae --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/notify/SysNotifyRuleSys.java @@ -0,0 +1,25 @@ +package com.lframework.xingyun.core.components.notify; + +import com.lframework.xingyun.core.dto.notify.SysNotifyParamsDto; + +/** + * 消息通知规则（站内信） + */ +public interface SysNotifyRuleSys extends SysNotifyRule { + + /** + * 获取标题 + * + * @param params + * @return + */ + String getTitle(SysNotifyParamsDto params); + + /** + * 获取内容 + * + * @param params + * @return + */ + String getContent(SysNotifyParamsDto params); +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/DataPermissionHandlerImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/DataPermissionHandlerImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..c809639588b8750ce53c662f6cbb105984de3a3f --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/DataPermissionHandlerImpl.java @@ -0,0 +1,177 @@ +package com.lframework.xingyun.core.components.permission; + +import cn.dev33.satoken.exception.SaTokenException; +import cn.dev33.satoken.session.SaSession; +import cn.dev33.satoken.stp.StpUtil; +import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; +import com.lframework.starter.common.exceptions.impl.DefaultSysException; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.components.security.SecurityConstants; +import com.lframework.xingyun.core.annotations.permission.DataPermission; +import com.lframework.xingyun.core.annotations.permission.DataPermissionGroup; +import com.lframework.xingyun.core.annotations.permission.DataPermissions; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; + +public class DataPermissionHandlerImpl implements DataPermissionHandler { + + private static final String EMPTY_SQL = "(1 = 1)"; + + @Override + public Expression getSqlSegment(Expression where, String mappedStatementId) { + try { + List sqlSegmentList = this.convertDataPermissionSql(mappedStatementId); + if (CollectionUtil.isEmpty(sqlSegmentList)) { + return null; + } + + List expressionList = new ArrayList<>(); + if (where != null) { + expressionList.add(where); + } + for (String sqlSegment : sqlSegmentList) { + Expression sqlSegmentExpression = CCJSqlParserUtil.parseCondExpression(sqlSegment); + expressionList.add(sqlSegmentExpression); + } + + Expression finalExpression = expressionList.get(0); + for (int i = 1; i < expressionList.size(); i++) { + finalExpression = new AndExpression(finalExpression, expressionList.get(i)); + } + return finalExpression; + } catch (JSQLParserException e) { + e.printStackTrace(); + } + return null; + } + + private String getDataPermission(SysDataPermissionDataPermissionType permissionType, + List keys, + List values) { + + Map dataPermissionMap = null; + Map dataPermissionVar = null; + try { + SaSession session = StpUtil.getSession(false); + if (session == null) { + return EMPTY_SQL; + } + dataPermissionMap = (Map) session.get( + SecurityConstants.DATA_PERMISSION_SQL_MAP); + + dataPermissionVar = (Map) session.get( + SecurityConstants.DATA_PERMISSION_SQL_VAR); + if (CollectionUtil.isEmpty(dataPermissionMap)) { + return EMPTY_SQL; + } + } catch (SaTokenException e) { + return EMPTY_SQL; + } + + Assert.notNull(permissionType); + Assert.notNull(keys); + Assert.notNull(values); + + String sqlTemplate = dataPermissionMap.get(permissionType.getCode().toString()); + if (StringUtil.isBlank(sqlTemplate)) { + return EMPTY_SQL; + } + + if (keys.size() != values.size()) { + throw new DefaultSysException("keys和values长度不一致！"); + } + + Map sqlParams = new HashMap<>(); + for (int i = 0; i < keys.size(); i++) { + sqlParams.put(keys.get(i), values.get(i)); + } + + if (CollectionUtil.isNotEmpty(dataPermissionVar)) { + dataPermissionVar.forEach((k, v) -> { + sqlParams.put("__var#" + k, v); + }); + } + + return StringUtil.format(sqlTemplate, sqlParams); + } + + private List convertDataPermissionSql(String statementId) { + // 获取Mapper执行方法上的注解 + Method mapperMethod = null; + try { + mapperMethod = this.findMapperMethod(this.convertMsId(statementId)); + } catch (ClassNotFoundException e) { + return null; + } + if (mapperMethod == null) { + return null; + } + + List results = new ArrayList<>(); + DataPermissionGroup dataPermissionGroup = mapperMethod.getAnnotation(DataPermissionGroup.class); + if (dataPermissionGroup != null) { + DataPermissions[] dataPermissionsArr = dataPermissionGroup.value(); + + if (dataPermissionsArr != null && dataPermissionsArr.length > 0) { + for (DataPermissions dataPermissions : dataPermissionsArr) { + buildDataPermissionSql(results, dataPermissions); + } + } + } else { + DataPermissions dataPermissions = mapperMethod.getAnnotation(DataPermissions.class); + if (dataPermissions != null) { + buildDataPermissionSql(results, dataPermissions); + } + } + return results; + } + + private String convertMsId(String id) { + String pageHelperSuffix = "_COUNT"; + if (id.endsWith(pageHelperSuffix)) { + return id.substring(0, id.length() - pageHelperSuffix.length()); + } + + String mpSuffix = "_mpCount"; + if (id.endsWith(mpSuffix)) { + return id.substring(0, id.length() - mpSuffix.length()); + } + + return id; + } + + private Method findMapperMethod(String statementId) + throws ClassNotFoundException { + int lastDotIndex = statementId.lastIndexOf("."); + String className = statementId.substring(0, lastDotIndex); + String methodName = statementId.substring(lastDotIndex + 1); + + Class mapperInterface = Class.forName(className); + return Arrays.stream(mapperInterface.getDeclaredMethods()) + .filter(method -> method.getName().equals(methodName)) + .findFirst() + .orElse(null); + } + + private void buildDataPermissionSql(List results, DataPermissions dataPermissions) { + SysDataPermissionDataPermissionType dataPermissionType = dataPermissions.type(); + DataPermission[] dataPermissionList = dataPermissions.value(); + String dataPermissionSql = this.getDataPermission(dataPermissionType, + Arrays.stream(dataPermissionList).map(DataPermission::template) + .collect(Collectors.toList()), + Arrays.stream(dataPermissionList).map(DataPermission::alias) + .collect(Collectors.toList())); + results.add(dataPermissionSql); + } +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/SysDataPermissionDataPermissionType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java similarity index 84% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/SysDataPermissionDataPermissionType.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java index e908f519f84a6314937d71f15aaded041292a72f..eef0a9e5074b80b64fbaa5a129e4f8e0803624a6 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/SysDataPermissionDataPermissionType.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/permission/SysDataPermissionDataPermissionType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.components.permission; +package com.lframework.xingyun.core.components.permission; public enum SysDataPermissionDataPermissionType { diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzHandler.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java similarity index 98% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzHandler.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java index 95aedf97a740db16a21c5da23be00f272e9e4a33..db5483af48a53056116ac6c91f90d0d0bd57a27f 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzHandler.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzHandler.java @@ -1,11 +1,11 @@ -package com.lframework.xingyun.template.core.components.qrtz; +package com.lframework.xingyun.core.components.qrtz; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultSysException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.quartz.CronScheduleBuilder; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzJob.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java similarity index 92% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzJob.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java index cf7c53ded15f3b02cfc40e300df11195c7f13e3b..5e6683839e14fe1779bbe6ad40ec02d2f7530e1f 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/qrtz/QrtzJob.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/components/qrtz/QrtzJob.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.template.core.components.qrtz; +package com.lframework.xingyun.core.components.qrtz; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.ClientException; -import com.lframework.starter.web.common.tenant.TenantContextHolder; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import java.io.Serializable; import lombok.extern.slf4j.Slf4j; import org.quartz.DisallowConcurrentExecution; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/config/MpInterceptorConfiguration.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java similarity index 82% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/config/MpInterceptorConfiguration.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java index 11b9135a38342b1045a7607d6b10edcc3dee0751..389abdfbc8878662cd3ed4bc7387443b575502f8 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/config/MpInterceptorConfiguration.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/config/MpInterceptorConfiguration.java @@ -1,12 +1,12 @@ -package com.lframework.xingyun.template.core.config; +package com.lframework.xingyun.core.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.lframework.xingyun.template.core.components.permission.DataPermissionHandlerImpl; -import com.lframework.xingyun.template.core.interceptors.CustomSortInterceptor; +import com.lframework.xingyun.core.components.permission.DataPermissionHandlerImpl; +import com.lframework.xingyun.core.interceptors.CustomSortInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/dto/DeptDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java similarity index 42% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/dto/DeptDto.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java index 25820f6a87e072ca43a5dc170fab8e77fb4ce744..647cb1516d238c509daee23ca839011bd05d3782 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/dto/DeptDto.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/GenerateCodeDto.java @@ -1,28 +1,23 @@ -package com.lframework.xingyun.template.core.dto; +package com.lframework.xingyun.core.dto; import com.lframework.starter.web.dto.BaseDto; import java.io.Serializable; import lombok.Data; @Data -public class DeptDto implements BaseDto, Serializable { +public class GenerateCodeDto implements BaseDto, Serializable { - private static final long serialVersionUID = 1L; + public static final String CACHE_NAME = "GenerateCodeDto"; - public static final String CACHE_NAME = "DeptDto"; + private static final long serialVersionUID = 1L; /** * ID */ - private String id; - - /** - * 编号 - */ - private String code; + private Integer id; /** - * 名称 + * 规则配置 */ - private String name; + private String configStr; } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysMailMessageDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysMailMessageDto.java new file mode 100644 index 0000000000000000000000000000000000000000..00924711d1ba783a86e285f26a3e2a445e52f429 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysMailMessageDto.java @@ -0,0 +1,35 @@ +package com.lframework.xingyun.core.dto.message; + +import com.lframework.starter.web.dto.BaseDto; +import java.io.Serializable; +import java.util.List; +import lombok.Data; + +@Data +public class SysMailMessageDto implements BaseDto, Serializable { + + /** + * 接收邮件列表 + */ + private List mailList; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * 业务键 + */ + private String bizKey; + + /** + * 创建人ID 如果是空表示由系统自动发起 + */ + private String createUserId; +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysSiteMessageDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysSiteMessageDto.java new file mode 100644 index 0000000000000000000000000000000000000000..6164de3f78c90f68d2328862825578b034198845 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/message/SysSiteMessageDto.java @@ -0,0 +1,35 @@ +package com.lframework.xingyun.core.dto.message; + +import com.lframework.starter.web.dto.BaseDto; +import java.io.Serializable; +import java.util.List; +import lombok.Data; + +@Data +public class SysSiteMessageDto implements BaseDto, Serializable { + + /** + * 接收邮件列表 + */ + private List userIdList; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * 业务键 + */ + private String bizKey; + + /** + * 创建人ID 如果是空表示由系统自动发起 + */ + private String createUserId; +} diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/cost/StockCostAdjustDiffDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java similarity index 36% rename from xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/cost/StockCostAdjustDiffDto.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java index 4f92c49a65172efaab4f45d83d46b001f23620cd..94e14a4f924d8dc93a422e47fea166b15e2daa9e 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/dto/stock/adjust/cost/StockCostAdjustDiffDto.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyDto.java @@ -1,27 +1,31 @@ -package com.lframework.xingyun.sc.dto.stock.adjust.cost; +package com.lframework.xingyun.core.dto.notify; import com.lframework.starter.web.dto.BaseDto; import java.io.Serializable; -import java.math.BigDecimal; import lombok.Data; @Data -public class StockCostAdjustDiffDto implements Serializable, BaseDto { +public class SysNotifyDto implements BaseDto, Serializable { private static final long serialVersionUID = 1L; /** - * 库存数量 + * 动态参数 */ - private Integer stockNum = 0; + private Object variables; /** - * 原价 + * 业务类型 */ - private BigDecimal oriPrice = BigDecimal.ZERO; + private Integer bizType; /** - * 调整金额 + * 通知组ID */ - private BigDecimal diffAmount = BigDecimal.ZERO; + private String notifyGroupId; + + /** + * 创建人ID 如果是空表示由系统自动发起 + */ + private String createUserId; } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyParamsDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyParamsDto.java new file mode 100644 index 0000000000000000000000000000000000000000..03c10ebf1223ec4be0ff7ea1209ba8e11b6938db --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/notify/SysNotifyParamsDto.java @@ -0,0 +1,16 @@ +package com.lframework.xingyun.core.dto.notify; + +import com.lframework.starter.web.dto.BaseDto; +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysNotifyParamsDto implements BaseDto, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 动态参数 + */ + private Object variables; +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/ApprovePassOrderEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/order/ApprovePassOrderDto.java similarity index 41% rename from xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/ApprovePassOrderEvent.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/dto/order/ApprovePassOrderDto.java index 962b4f632b92abc18325b381b6467c4b14acd9f6..72d4f2541e02b9c123825269071cea41027ed561 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/ApprovePassOrderEvent.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/order/ApprovePassOrderDto.java @@ -1,55 +1,36 @@ -package com.lframework.xingyun.core.events.order; +package com.lframework.xingyun.core.dto.order; +import com.lframework.starter.web.dto.BaseDto; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import lombok.Getter; -import lombok.Setter; -import org.springframework.context.ApplicationEvent; +import lombok.Data; -/** - * 业务单据审核通过Event - */ -public abstract class ApprovePassOrderEvent extends ApplicationEvent { +@Data +public class ApprovePassOrderDto implements BaseDto, Serializable { + + private static final long serialVersionUID = 1L; /** * 业务单据ID */ - @Getter - @Setter private String id; /** * 单据总金额 */ - @Getter - @Setter private BigDecimal totalAmount; /** * 审核时间 */ - @Getter - @Setter private LocalDateTime approveTime = LocalDateTime.now(); /** * 单据类型 */ - @Getter private OrderType orderType; - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassOrderEvent(Object source, OrderType orderType) { - - super(source); - this.orderType = orderType; - } - public enum OrderType { PURCHASE_ORDER, PURCHASE_RETURN, SALE_ORDER, SALE_RETURN, RETAIL_OUT_SHEET, RETAIL_RETURN } diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/stock/ProductStockChangeDto.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/stock/ProductStockChangeDto.java index 71446b1d9c20788d4f75f623e5ae91b3c7d213f8..dde504ab75f1d53494eb0f5b7a3ddc4fa495d947 100644 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/stock/ProductStockChangeDto.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/dto/stock/ProductStockChangeDto.java @@ -3,6 +3,7 @@ package com.lframework.xingyun.core.dto.stock; import com.lframework.starter.web.dto.BaseDto; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; import lombok.Data; @@ -27,7 +28,7 @@ public class ProductStockChangeDto implements BaseDto, Serializable { private Integer num; /** - * 含税金额 + * 含税变动金额 */ private BigDecimal taxAmount; @@ -35,4 +36,14 @@ public class ProductStockChangeDto implements BaseDto, Serializable { * 当前含税均价 */ private BigDecimal curTaxPrice; + + /** + * 当前库存数量 + */ + private Integer curStockNum; + + /** + * 生成时间 + */ + private LocalDateTime createTime; } diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/OpLogs.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java similarity index 95% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/OpLogs.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java index 6d685c1b267d632e6c21a8de2ed1298e58bc1622..f4b701005d2d2f1d41f0d8238fd8d57bcfa67462 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/OpLogs.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/OpLogs.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.entity; +package com.lframework.xingyun.core.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/RecursionMapping.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java similarity index 92% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/RecursionMapping.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java index 655c7d383263da0d82427ea6143ebb31a77f8e1d..1550cbe7075265c40983fa15c544b468beb91689 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/RecursionMapping.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/entity/RecursionMapping.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.entity; +package com.lframework.xingyun.core.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Available.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java similarity index 91% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Available.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java index 597ce0e3f9c5ac31eee2320a074ac832030e1d67..7ce1114b1cb874552b00538fbabc08ce89acc8f5 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Available.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Available.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.core.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/DefaultOpLogType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java similarity index 81% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/DefaultOpLogType.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java index 3d42c74fd5675d90597c00ce7564fe139dc20522..00f33217f29cc0a755364383a2bc92f2aa484a70 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/DefaultOpLogType.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/DefaultOpLogType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.core.enums; /** * 默认操作日志类别 diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Gender.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java similarity index 90% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Gender.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java index a3d51d5a386e88d79f7c4fc3ccf916477b123644..5fca18735c2404b66c4cbfbc4a240d7229b465cf 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/Gender.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/Gender.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.core.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/NodeType.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java similarity index 67% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/NodeType.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java index 5fa2615d7043761227b360fad39ca1708203bbc9..509e5e08fec66e928ddd82a2d2c56fb9ad27c3f6 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/NodeType.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/enums/NodeType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.core.enums; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseOrderEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseOrderEvent.java deleted file mode 100644 index 7be04460c4db6cafe2a2ede5fd0e9f015b2a209a..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseOrderEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassPurchaseOrderEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassPurchaseOrderEvent(Object source) { - - super(source, OrderType.PURCHASE_ORDER); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseReturnEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseReturnEvent.java deleted file mode 100644 index f97f50a43d3102c98459e6a1d0b2d389c0031130..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassPurchaseReturnEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassPurchaseReturnEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassPurchaseReturnEvent(Object source) { - - super(source, OrderType.PURCHASE_RETURN); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailOutSheetEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailOutSheetEvent.java deleted file mode 100644 index c653ddb8a7e3ddfda38010cb1f6b6b297bc83b00..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailOutSheetEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassRetailOutSheetEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassRetailOutSheetEvent(Object source) { - - super(source, OrderType.RETAIL_OUT_SHEET); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailReturnEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailReturnEvent.java deleted file mode 100644 index db68045ed20eee7c7c9525c7c40107a3edaffc1d..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassRetailReturnEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassRetailReturnEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassRetailReturnEvent(Object source) { - - super(source, OrderType.RETAIL_RETURN); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleOrderEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleOrderEvent.java deleted file mode 100644 index 556005357a4aeab5f577fdee6610dbdae95da3e2..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleOrderEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassSaleOrderEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassSaleOrderEvent(Object source) { - - super(source, OrderType.SALE_ORDER); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleReturnEvent.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleReturnEvent.java deleted file mode 100644 index 94eaff66a308eb06b091badac0dd65a041e39189..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/events/order/impl/ApprovePassSaleReturnEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.lframework.xingyun.core.events.order.impl; - -import com.lframework.xingyun.core.events.order.ApprovePassOrderEvent; - -public class ApprovePassSaleReturnEvent extends ApprovePassOrderEvent { - - /** - * Create a new {@code ApplicationEvent}. - * - * @param source the object on which the event initially occurred or with which the event is - * associated (never {@code null}) - */ - public ApprovePassSaleReturnEvent(Object source) { - - super(source, OrderType.SALE_RETURN); - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/FileBoxServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/FileBoxServiceImpl.java deleted file mode 100644 index a4eab08f43fe411ac8aff42b8d98cc8f8279c985..0000000000000000000000000000000000000000 --- a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/FileBoxServiceImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.lframework.xingyun.core.impl; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.FileUtil; -import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.UploadUtil; -import com.lframework.xingyun.core.entity.FileBox; -import com.lframework.xingyun.core.enums.FileBoxFileType; -import com.lframework.xingyun.core.enums.FileBoxNodeType; -import com.lframework.xingyun.core.enums.SwOpLogType; -import com.lframework.xingyun.core.mappers.FileBoxMapper; -import com.lframework.xingyun.core.service.FileBoxService; -import com.lframework.xingyun.core.vo.sw.filebox.CreateFileBoxDirVo; -import com.lframework.xingyun.core.vo.sw.filebox.QueryFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UpdateFileBoxVo; -import com.lframework.xingyun.core.vo.sw.filebox.UploadFileBoxVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -@Service -public class FileBoxServiceImpl extends - BaseMpServiceImpl implements FileBoxService { - - @Autowired - private RecursionMappingService recursionMappingService; - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QueryFileBoxVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public List query(QueryFileBoxVo vo) { - - return getBaseMapper().query(vo, SecurityUtil.getCurrentUser().getId()); - } - - @Override - public FileBox findById(String id) { - - return getBaseMapper().selectById(id); - } - - @OpLog(type = SwOpLogType.SW, name = "修改文件，ID：{}", params = {"#id"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateFileBoxVo vo) { - - FileBox data = getBaseMapper().selectById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("文件或文件夹不存在！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(FileBox.class) - .set(data.getFileType() != FileBoxFileType.DIR, FileBox::getName, vo.getName()) - .set(FileBox::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR - : vo.getDescription()) - .eq(FileBox::getId, vo.getId()); - - getBaseMapper().update(updateWrapper); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setExtra(vo); - } - - @OpLog(type = SwOpLogType.SW, name = "删除文件，ID：{}", params = { - "#ids"}, loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDelete(List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - List delIds = new ArrayList<>(); - - for (String id : ids) { - - List childIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(FileBoxNodeType.class)); - delIds.addAll(childIds); - } - - for (String id : ids) { - recursionMappingService.deleteNodeAndChildren(id, ApplicationUtil.getBean(FileBoxNodeType.class)); - } - - delIds.addAll(ids); - - Wrapper deleteWrapper = Wrappers.lambdaQuery(FileBox.class) - .in(FileBox::getId, delIds) - .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); - this.remove(deleteWrapper); - } - - @OpLog(type = SwOpLogType.SW, name = "创建文件夹，父级目录：{}，文件夹名称：{}", params = { - "#vo.parentPath", "#vo.name"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void createDir(CreateFileBoxDirVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(FileBox.class) - .eq(FileBox::getName, vo.getName()).eq(FileBox::getFilePath, vo.getParentPath()) - .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); - if (this.count(checkWrapper) > 0) { - throw new DefaultClientException("文件夹名称重复，请重新输入！"); - } - FileBox dir = new FileBox(); - dir.setId(IdUtil.getId()); - dir.setName(vo.getName()); - dir.setFileType(FileBoxFileType.DIR); - dir.setFilePath(vo.getParentPath()); - dir.setDescription(StringPool.EMPTY_STR); - - this.save(dir); - - if ("/".equals(vo.getParentPath())) { - recursionMappingService.saveNode(dir.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); - } else { - String path = vo.getParentPath().substring(0, vo.getParentPath().lastIndexOf("/") == 0 ? 1 : vo.getParentPath().lastIndexOf("/")); - String name = vo.getParentPath().substring(vo.getParentPath().lastIndexOf("/") + 1); - - Wrapper queryWrapper = Wrappers.lambdaQuery(FileBox.class) - .eq(FileBox::getName, name).eq(FileBox::getFilePath, path) - .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); - FileBox fileBox = this.getOne(queryWrapper); - if (fileBox == null) { - throw new DefaultClientException("父级目录不存在！"); - } - - List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); - parentIds.add(fileBox.getId()); - - recursionMappingService.saveNode(dir.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); - } - } - - @OpLog(type = SwOpLogType.SW, name = "上传文件，父级目录：{}，文件名称：{}", params = { - "#vo.path", "#vo.name"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void upload(UploadFileBoxVo vo) { - MultipartFile file = vo.getFile(); - String url = UploadUtil.upload(file); - - FileBox record = new FileBox(); - record.setId(IdUtil.getId()); - record.setName(file.getOriginalFilename()); - record.setUrl(url); - record.setContentType(file.getContentType()); - record.setFileType(FileBoxFileType.FILE); - record.setFileSize(FileUtil.readableFileSize(file.getSize())); - record.setFilePath(vo.getPath()); - record.setFileSuffix(FileUtil.getSuffix(file.getOriginalFilename())); - record.setDescription(StringPool.EMPTY_STR); - - this.save(record); - - if ("/".equals(vo.getPath())) { - recursionMappingService.saveNode(record.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); - } else { - String path = vo.getPath().substring(0, vo.getPath().lastIndexOf("/") == 0 ? 1 : vo.getPath().lastIndexOf("/")); - String name = vo.getPath().substring(vo.getPath().lastIndexOf("/") + 1); - - Wrapper queryWrapper = Wrappers.lambdaQuery(FileBox.class) - .eq(FileBox::getName, name).eq(FileBox::getFilePath, path) - .eq(FileBox::getCreateById, SecurityUtil.getCurrentUser().getId()); - FileBox fileBox = this.getOne(queryWrapper); - if (fileBox == null) { - throw new DefaultClientException("父级目录不存在！"); - } - - List parentIds = recursionMappingService.getNodeParentIds(fileBox.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class)); - parentIds.add(fileBox.getId()); - - recursionMappingService.saveNode(record.getId(), - ApplicationUtil.getBean(FileBoxNodeType.class), parentIds); - } - } - - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/GenerateCodeServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/GenerateCodeServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..7dd24ecef0b9908ea44cd3e6665520164e801bd3 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/GenerateCodeServiceImpl.java @@ -0,0 +1,35 @@ +package com.lframework.xingyun.core.impl; + +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.components.generator.GenerateCodeFactory; +import com.lframework.starter.web.components.generator.rule.GenerateCodeRule; +import com.lframework.xingyun.core.dto.GenerateCodeDto; +import com.lframework.xingyun.core.mappers.GenerateCodeMapper; +import com.lframework.xingyun.core.service.GenerateCodeService; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +@Service +public class GenerateCodeServiceImpl implements GenerateCodeService { + + @Autowired + private GenerateCodeMapper generateCodeMapper; + + @Override + public String generate(Integer id) { + GenerateCodeDto sysGenerateCode = generateCodeMapper.findById(id); + + GenerateCodeService thisService = ApplicationUtil.getBean(this.getClass()); + List ruleList = thisService.getRules(sysGenerateCode); + + return GenerateCodeFactory.generate(ruleList); + } + + @Cacheable(value = GenerateCodeDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #entity.id", unless = "#result == null") + @Override + public List getRules(GenerateCodeDto entity) { + return GenerateCodeFactory.getRules(entity.getConfigStr()); + } +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/OpLogsServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java similarity index 88% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/OpLogsServiceImpl.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java index abad287c270d9749c5e297464bfcbf264ce11fc9..dd41bb94aa9f02917ebe110c377e8054175e2fa7 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/OpLogsServiceImpl.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/OpLogsServiceImpl.java @@ -1,15 +1,15 @@ -package com.lframework.xingyun.template.core.impl; +package com.lframework.xingyun.core.impl; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.xingyun.template.core.entity.OpLogs; -import com.lframework.xingyun.template.core.mappers.OpLogsMapper; -import com.lframework.xingyun.template.core.service.OpLogsService; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.xingyun.template.core.vo.QueryOpLogsVo; +import com.lframework.xingyun.core.entity.OpLogs; +import com.lframework.xingyun.core.mappers.OpLogsMapper; +import com.lframework.xingyun.core.service.OpLogsService; +import com.lframework.xingyun.core.vo.CreateOpLogsVo; +import com.lframework.xingyun.core.vo.QueryOpLogsVo; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/RecursionMappingServiceImpl.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java similarity index 91% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/RecursionMappingServiceImpl.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java index 2c4b71a87e67a6e88eab61e85f6e9ea7367eeb11..edf5c04c8010f19160c1095bdd64ea7ed156dee6 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/RecursionMappingServiceImpl.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/impl/RecursionMappingServiceImpl.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.impl; +package com.lframework.xingyun.core.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,10 +7,10 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.entity.RecursionMapping; -import com.lframework.xingyun.template.core.enums.NodeType; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.mappers.RecursionMappingMapper; +import com.lframework.xingyun.core.entity.RecursionMapping; +import com.lframework.xingyun.core.enums.NodeType; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.mappers.RecursionMappingMapper; import java.util.ArrayList; import java.util.List; import lombok.NonNull; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/interceptors/CustomSortInterceptor.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java similarity index 96% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/interceptors/CustomSortInterceptor.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java index c3fdcb7e20bf9150745125d51ed9f849f03d6bc6..16144dabb644944c4b6cb411e54cc56be4d941cd 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/interceptors/CustomSortInterceptor.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/interceptors/CustomSortInterceptor.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.interceptors; +package com.lframework.xingyun.core.interceptors; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.vo.SortPageVo; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import java.lang.reflect.Method; import java.sql.SQLException; import java.util.Arrays; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/GenerateCodeMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/GenerateCodeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..06626783bfa06f6c3faa260e52f56b291481c3d6 --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/GenerateCodeMapper.java @@ -0,0 +1,8 @@ +package com.lframework.xingyun.core.mappers; + +import com.lframework.xingyun.core.dto.GenerateCodeDto; + +public interface GenerateCodeMapper { + + GenerateCodeDto findById(Integer id); +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/OpLogsMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java similarity index 78% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/OpLogsMapper.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java index 6691cfa859cc6ed611e0d212b8e1ce274242e6d9..d0988b3d19d75639f1f50482fe84a71db4e332d0 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/OpLogsMapper.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/OpLogsMapper.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.template.core.mappers; +package com.lframework.xingyun.core.mappers; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.core.entity.OpLogs; -import com.lframework.xingyun.template.core.vo.QueryOpLogsVo; +import com.lframework.xingyun.core.entity.OpLogs; +import com.lframework.xingyun.core.vo.QueryOpLogsVo; import java.time.LocalDateTime; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/RecursionMappingMapper.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java similarity index 76% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/RecursionMappingMapper.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java index 13e5513efcc0523f2c074377f54e637c97dc8e32..23f0f3e4b7c160bb053eb2158d1df97653917a2a 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/RecursionMappingMapper.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/mappers/RecursionMappingMapper.java @@ -1,7 +1,7 @@ -package com.lframework.xingyun.template.core.mappers; +package com.lframework.xingyun.core.mappers; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.core.entity.RecursionMapping; +import com.lframework.xingyun.core.entity.RecursionMapping; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqConstants.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqConstants.java new file mode 100644 index 0000000000000000000000000000000000000000..972f87e814ecb64a241445d84ebfd682d3f3255c --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqConstants.java @@ -0,0 +1,43 @@ +package com.lframework.xingyun.core.queue; + +import com.lframework.starter.mq.core.queue.QueueDefinition; +import com.lframework.starter.mq.rabbitmq.queue.RabbitMQQueueDefinition; + +public class MqConstants { + + /** + * 增加库存 + */ + public static final QueueDefinition ADD_STOCK = new RabbitMQQueueDefinition( + MqStringPool.ADD_STOCK_EXCHANGE); + + /** + * 扣减库存 + */ + public static final QueueDefinition SUB_STOCK = new RabbitMQQueueDefinition( + MqStringPool.SUB_STOCK_EXCHANGE); + + /** + * 审核通过订单 + */ + public static final QueueDefinition APPROVE_PASS_ORDER = new RabbitMQQueueDefinition( + MqStringPool.APPROVE_PASS_ORDER_EXCHANGE); + + /** + * 消息通知 + */ + public static final QueueDefinition SYS_NOTIFY = new RabbitMQQueueDefinition( + MqStringPool.SYS_NOTIFY_EXCHANGE, MqStringPool.SYS_NOTIFY_ROUTING_KEY); + + /** + * 邮件消息 + */ + public static final QueueDefinition SYS_MAIL_MESSAGE = new RabbitMQQueueDefinition( + MqStringPool.SYS_MAIL_MESSAGE_EXCHANGE, MqStringPool.SYS_MAIL_MESSAGE_ROUTING_KEY); + + /** + * 站内信 + */ + public static final QueueDefinition SYS_SITE_MESSAGE = new RabbitMQQueueDefinition( + MqStringPool.SYS_SITE_MESSAGE_EXCHANGE, MqStringPool.SYS_SITE_MESSAGE_ROUTING_KEY); +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqStringPool.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqStringPool.java new file mode 100644 index 0000000000000000000000000000000000000000..11d83ab0b3e4fc75aac556a2be96abfcb8a63b1a --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/queue/MqStringPool.java @@ -0,0 +1,28 @@ +package com.lframework.xingyun.core.queue; + +public interface MqStringPool { + + // 增加库存 + String ADD_STOCK_EXCHANGE = "add_stock.fanout"; + + // 扣减库存 + String SUB_STOCK_EXCHANGE = "sub_stock.fanout"; + + // 审核通过订单 + String APPROVE_PASS_ORDER_EXCHANGE = "approve_pass_order.fanout"; + + // 消息通知 + String SYS_NOTIFY_EXCHANGE = "sys_notify.direct"; + String SYS_NOTIFY_ROUTING_KEY = "sys_notify_routing_key"; + String SYS_NOTIFY_QUEUE = "sys_notify"; + + // 邮件消息 + String SYS_MAIL_MESSAGE_EXCHANGE = "sys_mail_message.direct"; + String SYS_MAIL_MESSAGE_ROUTING_KEY = "sys_mail_message_routing_key"; + String SYS_MAIL_MESSAGE_QUEUE = "sys_mail_message"; + + // 站内信 + String SYS_SITE_MESSAGE_EXCHANGE = "sys_site_message.direct"; + String SYS_SITE_MESSAGE_ROUTING_KEY = "sys_site_message_routing_key"; + String SYS_SITE_MESSAGE_QUEUE = "sys_site_message"; +} diff --git a/xingyun-core/src/main/java/com/lframework/xingyun/core/service/GenerateCodeService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/GenerateCodeService.java new file mode 100644 index 0000000000000000000000000000000000000000..39185d40b53396b4aa52d910d1125abc216d199e --- /dev/null +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/GenerateCodeService.java @@ -0,0 +1,30 @@ +package com.lframework.xingyun.core.service; + +import com.lframework.starter.web.components.generator.rule.GenerateCodeRule; +import com.lframework.starter.web.service.BaseService; +import com.lframework.xingyun.core.dto.GenerateCodeDto; +import java.util.List; + +/** + * 生成单号Service + * + * @author zmj + */ +public interface GenerateCodeService extends BaseService { + + /** + * 生成code + * + * @param id + * @return + */ + String generate(Integer id); + + /** + * 根据实体类获取编号规则 + * + * @param entity + * @return + */ + List getRules(GenerateCodeDto entity); +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/OpLogsService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java similarity index 78% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/OpLogsService.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java index 1537d09afe607608d8159bce5585da9cbabac66e..2dd4f9e5442a8f814e23d8fd2ddf6337fc3f1655 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/OpLogsService.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/OpLogsService.java @@ -1,10 +1,10 @@ -package com.lframework.xingyun.template.core.service; +package com.lframework.xingyun.core.service; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.core.entity.OpLogs; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.xingyun.template.core.vo.QueryOpLogsVo; +import com.lframework.xingyun.core.entity.OpLogs; +import com.lframework.xingyun.core.vo.CreateOpLogsVo; +import com.lframework.xingyun.core.vo.QueryOpLogsVo; import java.time.LocalDateTime; import java.util.Collection; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/RecursionMappingService.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java similarity index 86% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/RecursionMappingService.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java index 7588761ad68f5aee6eb3d95bb4fc5f911db9dbbd..ea0737296f862b9bd443bb34d1d321e983dc38cb 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/RecursionMappingService.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/service/RecursionMappingService.java @@ -1,9 +1,9 @@ -package com.lframework.xingyun.template.core.service; +package com.lframework.xingyun.core.service; import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.core.entity.RecursionMapping; -import com.lframework.xingyun.template.core.enums.NodeType; +import com.lframework.xingyun.core.entity.RecursionMapping; +import com.lframework.xingyun.core.enums.NodeType; import java.util.List; public interface RecursionMappingService extends BaseMpService { diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/utils/OpLogUtil.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java similarity index 49% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/utils/OpLogUtil.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java index 699a768e83084c775325363c04fc4a53da135ff4..e9b869baa20773a3513b34c0dba9cb027ee45536 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/utils/OpLogUtil.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/utils/OpLogUtil.java @@ -1,14 +1,19 @@ -package com.lframework.xingyun.template.core.utils; +package com.lframework.xingyun.core.utils; -import com.lframework.xingyun.template.core.service.OpLogsService; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.common.utils.ThreadUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.threads.DefaultRunnable; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.JsonUtil; +import com.lframework.xingyun.core.service.OpLogsService; +import com.lframework.xingyun.core.vo.CreateOpLogsVo; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutorService; import lombok.extern.slf4j.Slf4j; /** @@ -19,11 +24,16 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class OpLogUtil { - private static final ThreadLocal>> VARIABLE_POOL = new ThreadLocal<>(); + private static final ThreadLocal>> VARIABLE_POOL = new InheritableThreadLocal<>(); - private static final ThreadLocal> LOG_ID_POOL = new ThreadLocal<>(); + private static final ThreadLocal> LOG_ID_POOL = new InheritableThreadLocal<>(); - private static final ThreadLocal> EXTRA_POOL = new ThreadLocal<>(); + private static final ThreadLocal> EXTRA_POOL = new InheritableThreadLocal<>(); + + private static final ThreadLocal> OP_LOG_POOL = new InheritableThreadLocal<>(); + + private static final ExecutorService OP_LOG_EXECUTOR = ThreadUtil.newExecutorByBlockingCoefficient( + 0); public static void init(String logId) { @@ -34,26 +44,10 @@ public class OpLogUtil { VARIABLE_POOL.get().putIfAbsent(logId, new HashMap<>()); } - public static void addLog(CreateOpLogsVo vo) { - - try { - OpLogsService opLogsService = ApplicationUtil.getBean(OpLogsService.class); - - // 这里不异步，需要在同事务内执行 - opLogsService.create(vo); - } catch (Exception e) { - // 这里异常不抛出 - log.error(e.getMessage(), e); - } - } - public static void addLogs(Collection list) { try { - OpLogsService opLogsService = ApplicationUtil.getBean(OpLogsService.class); - - // 这里不异步，需要在同事务内执行 - opLogsService.create(list); + OP_LOG_POOL.get().addAll(list); } catch (Exception e) { // 这里异常不抛出 log.error(e.getMessage(), e); @@ -82,11 +76,48 @@ public class OpLogUtil { EXTRA_POOL.get().put(getCurrentLogId(), value); } + public static void submitLog() { + submitLog(SecurityUtil.getCurrentUser()); + } + + public static void submitLog(AbstractUserDetails currentUser) { + if (LOG_ID_POOL.get() == null || LOG_ID_POOL.get().size() != 1) { + return; + } + List logs = OP_LOG_POOL.get(); + OpLogsService opLogsService = ApplicationUtil.getBean(OpLogsService.class); + OP_LOG_EXECUTOR.submit(new DefaultRunnable(() -> { + if (SecurityUtil.getCurrentUser() != null) { + opLogsService.create(logs); + } else { + if (currentUser != null) { + try { + SecurityUtil.setCurrentUser(currentUser); + opLogsService.create(logs); + } finally { + SecurityUtil.removeCurrentUser(); + } + } + } + })); + } + public static void clear() { + boolean allClear = false; + if (LOG_ID_POOL.get().size() == 1) { + allClear = true; + } VARIABLE_POOL.get().remove(getCurrentLogId()); EXTRA_POOL.get().remove(getCurrentLogId()); LOG_ID_POOL.get().remove(LOG_ID_POOL.get().size() - 1); + + if (allClear) { + VARIABLE_POOL.remove(); + EXTRA_POOL.remove(); + LOG_ID_POOL.remove(); + OP_LOG_POOL.remove(); + } } private static void initPool() { @@ -102,6 +133,10 @@ public class OpLogUtil { if (EXTRA_POOL.get() == null) { EXTRA_POOL.set(new HashMap<>()); } + + if (OP_LOG_POOL.get() == null) { + OP_LOG_POOL.set(new ArrayList<>()); + } } private static String getCurrentLogId() { diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/CreateOpLogsVo.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java similarity index 94% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/CreateOpLogsVo.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java index c2c7dc9c2ae67b06a2fc046be9dafa69e9e8adb9..296a15fb2b286e9c652099aec8089655b02bf06a 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/CreateOpLogsVo.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/CreateOpLogsVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.vo; +package com.lframework.xingyun.core.vo; import com.lframework.starter.web.vo.BaseVo; import java.io.Serializable; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/QueryOpLogsVo.java b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java similarity index 94% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/QueryOpLogsVo.java rename to xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java index cf3d54eb6a4a5e609ba0c7c51095025c78bcef18..dfc563c84885e7c6041a177b48ca51c6bd461aae 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/QueryOpLogsVo.java +++ b/xingyun-core/src/main/java/com/lframework/xingyun/core/vo/QueryOpLogsVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.vo; +package com.lframework.xingyun.core.vo; import com.lframework.starter.web.vo.PageVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml b/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..5871e939040ebb8f6126ca6117d1ae2aac07d11b --- /dev/null +++ b/xingyun-core/src/main/resources/mappers/GenerateCodeMapper.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/xingyun-template-core/src/main/resources/mappers/OpLogsMapper.xml b/xingyun-core/src/main/resources/mappers/OpLogsMapper.xml similarity index 84% rename from xingyun-template-core/src/main/resources/mappers/OpLogsMapper.xml rename to xingyun-core/src/main/resources/mappers/OpLogsMapper.xml index 537503d74db1f2277b289390d9accb868c2ea936..23195661bd1471f6f641d6748fd7c7788e4a07bd 100644 --- a/xingyun-template-core/src/main/resources/mappers/OpLogsMapper.xml +++ b/xingyun-core/src/main/resources/mappers/OpLogsMapper.xml @@ -1,6 +1,6 @@ - + SELECT @@ -16,7 +16,7 @@ ]]> - @@ -42,7 +42,7 @@ ORDER BY create_time DESC - WHERE id = #{id} diff --git a/xingyun-template-core/src/main/resources/mappers/RecursionMappingMappre.xml b/xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml similarity index 81% rename from xingyun-template-core/src/main/resources/mappers/RecursionMappingMappre.xml rename to xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml index 66c2164097d0ae67c9d56dbb7dc1050d9961b39e..b1ebb1b61bf4230c57458fced19058e855b91f56 100644 --- a/xingyun-template-core/src/main/resources/mappers/RecursionMappingMappre.xml +++ b/xingyun-core/src/main/resources/mappers/RecursionMappingMappre.xml @@ -1,6 +1,6 @@ - + WHERE gs.product_id = #{productId} diff --git a/xingyun-sc/src/main/resources/mappers/stock/ProductStockWarningMapper.xml b/xingyun-sc/src/main/resources/mappers/stock/ProductStockWarningMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a72e05aae3275aa14daa4c88633004e4a349f765 --- /dev/null +++ b/xingyun-sc/src/main/resources/mappers/stock/ProductStockWarningMapper.xml @@ -0,0 +1,40 @@ + + + + + + SELECT + tb.* + FROM tbl_product_stock_warning AS tb + LEFT JOIN base_data_product AS p ON p.id = tb.product_id + LEFT JOIN base_data_store_center AS sc ON sc.id = tb.sc_id + LEFT JOIN base_data_product_brand AS b ON b.id = p.brand_id + LEFT JOIN base_data_product_category AS c ON c.id = p.category_id + + + + diff --git a/xingyun-sc/src/main/resources/mappers/stock/adjust/StockCostAdjustSheetMapper.xml b/xingyun-sc/src/main/resources/mappers/stock/adjust/StockCostAdjustSheetMapper.xml deleted file mode 100644 index d924b78388d01283cb159e74cbe30a0958219e57..0000000000000000000000000000000000000000 --- a/xingyun-sc/src/main/resources/mappers/stock/adjust/StockCostAdjustSheetMapper.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT - tb.id, - tb.code, - tb.sc_id, - tb.product_num, - tb.diff_amount, - tb.status, - tb.description, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time, - tb.approve_by, - tb.approve_time, - tb.refuse_reason - FROM tbl_stock_cost_adjust_sheet AS tb - - - - SELECT - tb.id, - tb.code, - tb.sc_id, - tb.product_num, - tb.diff_amount, - tb.status, - tb.description, - tb.create_by, - tb.create_time, - tb.update_by, - tb.update_time, - tb.approve_by, - tb.approve_time, - tb.refuse_reason, - d.id AS detail_id, - d.product_id AS detail_product_id, - d.purchase_price AS detail_purchase_price, - d.stock_num AS detail_stock_num, - d.ori_price AS detail_ori_price, - d.price AS detail_price, - d.diff_amount AS detail_diff_amount, - d.description AS detail_description - FROM tbl_stock_cost_adjust_sheet AS tb - LEFT JOIN tbl_stock_cost_adjust_sheet_detail AS d ON d.sheet_id = tb.id - - - - SELECT - g.id, - g.code, - g.name, - c.id AS category_id, - c.name AS category_name, - b.id AS brand_id, - b.name AS brand_name, - g.sku_code, - g.external_code, - g.spec, - g.unit, - purchase.price AS purchase_price, - s.tax_price AS ori_price, - s.stock_num - FROM tbl_product_stock AS s - INNER JOIN base_data_product AS g ON g.id = s.product_id AND g.product_type = 1 - INNER JOIN base_data_product_purchase AS purchase ON purchase.id = g.id - LEFT JOIN base_data_product_category AS c ON c.id = g.category_id - LEFT JOIN base_data_product_brand AS b ON b.id = g.brand_id - LEFT JOIN recursion_mapping AS rm ON rm.node_id = c.id and rm.node_type = 2 - - - - - - - - - diff --git a/xingyun-sc/src/main/resources/print/purchase-order.ftl b/xingyun-sc/src/main/resources/print/purchase-order.ftl index 7d8418c3d90035935342e374e7efcd4621119671..4736e190700cfda24c46b898e3498e80c0866775 100644 --- a/xingyun-sc/src/main/resources/print/purchase-order.ftl +++ b/xingyun-sc/src/main/resources/print/purchase-order.ftl @@ -86,7 +86,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 采购价 diff --git a/xingyun-sc/src/main/resources/print/purchase-return.ftl b/xingyun-sc/src/main/resources/print/purchase-return.ftl index 514b2cce63abc1fd2962e7790f128b4fd1bfb2ef..4a329772dcc8ebf6b383fdc4c1a099f2b46b91ce 100644 --- a/xingyun-sc/src/main/resources/print/purchase-return.ftl +++ b/xingyun-sc/src/main/resources/print/purchase-return.ftl @@ -92,7 +92,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 采购价 diff --git a/xingyun-sc/src/main/resources/print/receive-sheet.ftl b/xingyun-sc/src/main/resources/print/receive-sheet.ftl index a401387c9da6009147acf0a97738911ade2ab3f6..81f7195049bdd2807ad1425f88d2d2284698992e 100644 --- a/xingyun-sc/src/main/resources/print/receive-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/receive-sheet.ftl @@ -96,7 +96,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 采购价 diff --git a/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl b/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl index 54e66e79863cba017589acc70018460d8d942193..b6a991bfd9f08a3996ad6b0897d2bc2aff8d883b 100644 --- a/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/retail-out-sheet.ftl @@ -89,7 +89,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 价格 diff --git a/xingyun-sc/src/main/resources/print/retail-return.ftl b/xingyun-sc/src/main/resources/print/retail-return.ftl index 29a6ff1eb5fd2db335143b96f209e1eef44265e2..34f441a420e6d1121893ff090064a5e0ac268384 100644 --- a/xingyun-sc/src/main/resources/print/retail-return.ftl +++ b/xingyun-sc/src/main/resources/print/retail-return.ftl @@ -92,7 +92,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 供应商 diff --git a/xingyun-sc/src/main/resources/print/sale-order.ftl b/xingyun-sc/src/main/resources/print/sale-order.ftl index f3e49358b6526cbaade7bfd42fe9eea8c9e4cc2d..05023866dda3cfc2f0582598f3fce012a57945a2 100644 --- a/xingyun-sc/src/main/resources/print/sale-order.ftl +++ b/xingyun-sc/src/main/resources/print/sale-order.ftl @@ -78,7 +78,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 价格 diff --git a/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl b/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl index c3aefbb1cdbf5c0cc657b35700e081ca696f264b..81306a6e9f08f5fb00e34c20b546c33908d1adf0 100644 --- a/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl +++ b/xingyun-sc/src/main/resources/print/sale-out-sheet.ftl @@ -95,7 +95,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 价格 diff --git a/xingyun-sc/src/main/resources/print/sale-return.ftl b/xingyun-sc/src/main/resources/print/sale-return.ftl index edf1b91cbcce8c76f2589e212e12d0c038701fa5..d4001e7af8df52f086f2662be331386f8396d53f 100644 --- a/xingyun-sc/src/main/resources/print/sale-return.ftl +++ b/xingyun-sc/src/main/resources/print/sale-return.ftl @@ -92,7 +92,7 @@ 商品SKU编号 - 商品外部编号 + 商品简码 供应商 diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/GetSettleCheckSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/GetSettleCheckSheetBo.java index 73df52bd7c85c9a772580d88c79d538bf78b785e..49079b21f85744b317b7e1ecbfbbda2c388ca445 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/GetSettleCheckSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/GetSettleCheckSheetBo.java @@ -6,14 +6,14 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.dto.check.SettleCheckBizItemDto; import com.lframework.xingyun.settle.dto.check.SettleCheckSheetFullDto; import com.lframework.xingyun.settle.service.SettleCheckSheetService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -24,104 +24,201 @@ import lombok.Data; @Data public class GetSettleCheckSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 应付金额 + */ + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; + + /** + * 已付金额 + */ + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付金额 + */ + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetSettleCheckSheetBo() { + + } + + public GetSettleCheckSheetBo(SettleCheckSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleCheckSheetFullDto dto) { + + return super.convert(dto, GetSettleCheckSheetBo::getStatus, GetSettleCheckSheetBo::getDetails); + } + + @Override + protected void afterInit(SettleCheckSheetFullDto dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + + this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); + } + } - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; + @Data + public static class SheetDetailBo extends BaseBo { /** - * 截止时间 + * 明细ID */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; + @ApiModelProperty("明细ID") + private String id; /** - * 备注 + * 单据ID */ - @ApiModelProperty("备注") - private String description; + @ApiModelProperty("单据ID") + private String bizId; /** - * 创建人ID + * 单据号 */ - @ApiModelProperty("创建人ID") - private String createBy; + @ApiModelProperty("单据号") + private String bizCode; /** - * 创建时间 + * 业务类型 */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; + @ApiModelProperty("业务类型") + private Integer bizType; /** - * 审核人 + * 计算类型 */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("计算类型") + private Integer calcType; /** * 审核时间 @@ -131,147 +228,52 @@ public class GetSettleCheckSheetBo extends BaseBo { private LocalDateTime approveTime; /** - * 状态 + * 单据金额 */ - @ApiModelProperty("状态") - private Integer status; + @ApiModelProperty("单据金额") + private BigDecimal totalAmount; /** - * 拒绝原因 + * 应付金额 */ - @ApiModelProperty("拒绝原因") - private String refuseReason; + @ApiModelProperty("应付金额") + private BigDecimal payAmount; - @ApiModelProperty("明细") - private List details; + /** + * 单据备注 + */ + @ApiModelProperty("单据备注") + private String description; - public GetSettleCheckSheetBo() { + public SheetDetailBo() { } - public GetSettleCheckSheetBo(SettleCheckSheetFullDto dto) { + public SheetDetailBo(SettleCheckSheetFullDto.SheetDetailDto dto) { - super(dto); + super(dto); } @Override - public BaseBo convert(SettleCheckSheetFullDto dto) { + public BaseBo convert( + SettleCheckSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetSettleCheckSheetBo::getStatus, GetSettleCheckSheetBo::getDetails); + return super.convert(dto, SettleCheckSheetFullDto.SheetDetailDto::getBizType, + SettleCheckSheetFullDto.SheetDetailDto::getCalcType); } @Override - protected void afterInit(SettleCheckSheetFullDto dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - - this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), - dto.getTotalDiscountAmount()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 单据ID - */ - @ApiModelProperty("单据ID") - private String bizId; - - /** - * 单据号 - */ - @ApiModelProperty("单据号") - private String bizCode; - - /** - * 业务类型 - */ - @ApiModelProperty("业务类型") - private Integer bizType; - - /** - * 计算类型 - */ - @ApiModelProperty("计算类型") - private Integer calcType; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 单据金额 - */ - @ApiModelProperty("单据金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal payAmount; - - /** - * 单据备注 - */ - @ApiModelProperty("单据备注") - private String description; - - public SheetDetailBo() { - - } - - public SheetDetailBo(SettleCheckSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleCheckSheetFullDto.SheetDetailDto dto) { - - return super.convert(dto, SettleCheckSheetFullDto.SheetDetailDto::getBizType, - SettleCheckSheetFullDto.SheetDetailDto::getCalcType); - } - - @Override - protected void afterInit(SettleCheckSheetFullDto.SheetDetailDto dto) { - - SettleCheckSheetService settleCheckSheetService = ApplicationUtil.getBean( - SettleCheckSheetService.class); - SettleCheckBizItemDto item = settleCheckSheetService.getBizItem(dto.getBizId(), dto.getBizType()); - this.bizCode = item.getCode(); - this.approveTime = item.getApproveTime(); - this.bizType = dto.getBizType().getCode(); - this.totalAmount = item.getTotalAmount(); - this.calcType = dto.getCalcType().getCode(); - } + protected void afterInit(SettleCheckSheetFullDto.SheetDetailDto dto) { + + SettleCheckSheetService settleCheckSheetService = ApplicationUtil.getBean( + SettleCheckSheetService.class); + SettleCheckBizItemDto item = settleCheckSheetService.getBizItem(dto.getBizId(), + dto.getBizType()); + this.bizCode = item.getCode(); + this.approveTime = item.getApproveTime(); + this.bizType = dto.getBizType().getCode(); + this.totalAmount = item.getTotalAmount(); + this.calcType = dto.getCalcType().getCode(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/QuerySettleCheckSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/QuerySettleCheckSheetBo.java index 95fffd8b3d6f1547c71c8d25690c47e8553b3fb2..c6508ce0ef8636bd2c7dd3f057d96c5b49ead1b7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/QuerySettleCheckSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/QuerySettleCheckSheetBo.java @@ -5,12 +5,12 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.entity.SettleCheckSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -19,160 +19,161 @@ import lombok.Data; @Data public class QuerySettleCheckSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; - - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; - - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; - - /** - * 截止时间 - */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QuerySettleCheckSheetBo() { - - } - - public QuerySettleCheckSheetBo(SettleCheckSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleCheckSheet dto) { - - return super.convert(dto, QuerySettleCheckSheetBo::getStatus, QuerySettleCheckSheetBo::getSettleStatus); + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 应付金额 + */ + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; + + /** + * 已付金额 + */ + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付金额 + */ + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QuerySettleCheckSheetBo() { + + } + + public QuerySettleCheckSheetBo(SettleCheckSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleCheckSheet dto) { + + return super.convert(dto, QuerySettleCheckSheetBo::getStatus, + QuerySettleCheckSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(SettleCheckSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } - @Override - protected void afterInit(SettleCheckSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), - dto.getTotalDiscountAmount()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - } + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/GetCustomerSettleCheckSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/GetCustomerSettleCheckSheetBo.java index 1db0c5edfc6d20723efa03da03016de9fe0728e8..e04083a392a01a3aecc8fbcefa7f5f15012a2159 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/GetCustomerSettleCheckSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/GetCustomerSettleCheckSheetBo.java @@ -6,14 +6,14 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.dto.check.customer.CustomerSettleCheckBizItemDto; import com.lframework.xingyun.settle.dto.check.customer.CustomerSettleCheckSheetFullDto; import com.lframework.xingyun.settle.service.CustomerSettleCheckSheetService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -24,104 +24,204 @@ import lombok.Data; @Data public class GetCustomerSettleCheckSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 应付金额 + */ + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; + + /** + * 已付金额 + */ + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付金额 + */ + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetCustomerSettleCheckSheetBo() { + + } + + public GetCustomerSettleCheckSheetBo(CustomerSettleCheckSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleCheckSheetFullDto dto) { + + return super.convert(dto, GetCustomerSettleCheckSheetBo::getStatus, + GetCustomerSettleCheckSheetBo::getDetails); + } + + @Override + protected void afterInit(CustomerSettleCheckSheetFullDto dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + + this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new) + .collect(Collectors.toList()); + } + } - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; + @Data + public static class SheetDetailBo extends + BaseBo { /** - * 截止时间 + * 明细ID */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; + @ApiModelProperty("明细ID") + private String id; /** - * 备注 + * 单据ID */ - @ApiModelProperty("备注") - private String description; + @ApiModelProperty("单据ID") + private String bizId; /** - * 创建人ID + * 单据号 */ - @ApiModelProperty("创建人ID") - private String createBy; + @ApiModelProperty("单据号") + private String bizCode; /** - * 创建时间 + * 业务类型 */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; + @ApiModelProperty("业务类型") + private Integer bizType; /** - * 审核人 + * 计算类型 */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("计算类型") + private Integer calcType; /** * 审核时间 @@ -131,152 +231,52 @@ public class GetCustomerSettleCheckSheetBo extends BaseBo details; + /** + * 单据备注 + */ + @ApiModelProperty("单据备注") + private String description; - public GetCustomerSettleCheckSheetBo() { + public SheetDetailBo() { } - public GetCustomerSettleCheckSheetBo(CustomerSettleCheckSheetFullDto dto) { + public SheetDetailBo(CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { - super(dto); + super(dto); } @Override - public BaseBo convert(CustomerSettleCheckSheetFullDto dto) { + public BaseBo convert( + CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetCustomerSettleCheckSheetBo::getStatus, - GetCustomerSettleCheckSheetBo::getDetails); + return super.convert(dto, CustomerSettleCheckSheetFullDto.SheetDetailDto::getBizType, + CustomerSettleCheckSheetFullDto.SheetDetailDto::getCalcType); } @Override - protected void afterInit(CustomerSettleCheckSheetFullDto dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - - this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), - dto.getTotalDiscountAmount()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new) - .collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends - BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 单据ID - */ - @ApiModelProperty("单据ID") - private String bizId; - - /** - * 单据号 - */ - @ApiModelProperty("单据号") - private String bizCode; - - /** - * 业务类型 - */ - @ApiModelProperty("业务类型") - private Integer bizType; - - /** - * 计算类型 - */ - @ApiModelProperty("计算类型") - private Integer calcType; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 单据金额 - */ - @ApiModelProperty("单据金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal payAmount; - - /** - * 单据备注 - */ - @ApiModelProperty("单据备注") - private String description; - - public SheetDetailBo() { - - } - - public SheetDetailBo(CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - public BaseBo convert( - CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { - - return super.convert(dto, CustomerSettleCheckSheetFullDto.SheetDetailDto::getBizType, - CustomerSettleCheckSheetFullDto.SheetDetailDto::getCalcType); - } - - @Override - protected void afterInit(CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { - - CustomerSettleCheckSheetService settleCheckSheetService = ApplicationUtil.getBean( - CustomerSettleCheckSheetService.class); - CustomerSettleCheckBizItemDto item = settleCheckSheetService.getBizItem(dto.getBizId(), - dto.getBizType()); - this.bizCode = item.getCode(); - this.approveTime = item.getApproveTime(); - this.bizType = dto.getBizType().getCode(); - this.totalAmount = item.getTotalAmount(); - this.calcType = dto.getCalcType().getCode(); - } + protected void afterInit(CustomerSettleCheckSheetFullDto.SheetDetailDto dto) { + + CustomerSettleCheckSheetService settleCheckSheetService = ApplicationUtil.getBean( + CustomerSettleCheckSheetService.class); + CustomerSettleCheckBizItemDto item = settleCheckSheetService.getBizItem(dto.getBizId(), + dto.getBizType()); + this.bizCode = item.getCode(); + this.approveTime = item.getApproveTime(); + this.bizType = dto.getBizType().getCode(); + this.totalAmount = item.getTotalAmount(); + this.calcType = dto.getCalcType().getCode(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/QueryCustomerSettleCheckSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/QueryCustomerSettleCheckSheetBo.java index 99cbc8db5520870a2b5427ceaea451e62f20bb23..9c7bbb57a635b346dc4b94e4a87068bd4f7b1ec1 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/QueryCustomerSettleCheckSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/check/customer/QueryCustomerSettleCheckSheetBo.java @@ -5,12 +5,12 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -19,161 +19,161 @@ import lombok.Data; @Data public class QueryCustomerSettleCheckSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; - - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; - - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; - - /** - * 截止时间 - */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QueryCustomerSettleCheckSheetBo() { - - } - - public QueryCustomerSettleCheckSheetBo(CustomerSettleCheckSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleCheckSheet dto) { - - return super.convert(dto, QueryCustomerSettleCheckSheetBo::getStatus, - QueryCustomerSettleCheckSheetBo::getSettleStatus); + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 应付金额 + */ + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; + + /** + * 已付金额 + */ + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付金额 + */ + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QueryCustomerSettleCheckSheetBo() { + + } + + public QueryCustomerSettleCheckSheetBo(CustomerSettleCheckSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleCheckSheet dto) { + + return super.convert(dto, QueryCustomerSettleCheckSheetBo::getStatus, + QueryCustomerSettleCheckSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(CustomerSettleCheckSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } - @Override - protected void afterInit(CustomerSettleCheckSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - this.totalUnPayAmount = NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), - dto.getTotalDiscountAmount()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - } + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/GetSettleFeeSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/GetSettleFeeSheetBo.java index 541d16ede949482b1640102f25318045d444728f..196cbff47db65f690448e2811bfcb76e8d5a6a01 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/GetSettleFeeSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/GetSettleFeeSheetBo.java @@ -5,9 +5,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.dto.fee.SettleFeeSheetFullDto; @@ -16,6 +15,7 @@ import com.lframework.xingyun.settle.entity.SettleOutItem; import com.lframework.xingyun.settle.enums.SettleFeeSheetType; import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.service.SettleOutItemService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -141,7 +141,7 @@ public class GetSettleFeeSheetBo extends BaseBo { this.sheetType = dto.getSheetType().getCode(); this.status = dto.getStatus().getCode(); - UserService userService = ApplicationUtil.getBean(UserService.class); + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); if (!StringUtil.isBlank(dto.getApproveBy())) { this.approveBy = userService.findById(dto.getApproveBy()).getName(); diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/QuerySettleFeeSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/QuerySettleFeeSheetBo.java index c8e8ebc438ae869ed8f947da85c09e4de3a745d9..1eb622774225f898336a5855bd907b4dc699354b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/QuerySettleFeeSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/QuerySettleFeeSheetBo.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.settle.bo.fee; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.entity.SettleFeeSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -17,124 +17,124 @@ import lombok.Data; @Data public class QuerySettleFeeSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 单据类型 - */ - @ApiModelProperty("单据类型") - private Integer sheetType; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QuerySettleFeeSheetBo() { - - } - - public QuerySettleFeeSheetBo(SettleFeeSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleFeeSheet dto) { - - return super.convert(dto, QuerySettleFeeSheetBo::getSheetType, QuerySettleFeeSheetBo::getStatus, - QuerySettleFeeSheetBo::getSettleStatus); - } - - @Override - protected void afterInit(SettleFeeSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.sheetType = dto.getSheetType().getCode(); - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 单据类型 + */ + @ApiModelProperty("单据类型") + private Integer sheetType; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QuerySettleFeeSheetBo() { + + } + + public QuerySettleFeeSheetBo(SettleFeeSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleFeeSheet dto) { + + return super.convert(dto, QuerySettleFeeSheetBo::getSheetType, QuerySettleFeeSheetBo::getStatus, + QuerySettleFeeSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(SettleFeeSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.sheetType = dto.getSheetType().getCode(); + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/GetCustomerSettleFeeSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/GetCustomerSettleFeeSheetBo.java index ded7d00699f6eb8f0e2b7be9878b638e83d17fec..35f59613852b5adc461dd2275d6cc68146d93af7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/GetCustomerSettleFeeSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/fee/customer/GetCustomerSettleFeeSheetBo.java @@ -5,9 +5,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFullDto; @@ -16,6 +15,7 @@ import com.lframework.xingyun.settle.entity.SettleOutItem; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetType; import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.service.SettleOutItemService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -143,7 +143,7 @@ public class GetCustomerSettleFeeSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 单据类型 - */ - @ApiModelProperty("单据类型") - private Integer sheetType; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QueryCustomerSettleFeeSheetBo() { - - } - - public QueryCustomerSettleFeeSheetBo(CustomerSettleFeeSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleFeeSheet dto) { - - return super.convert(dto, QueryCustomerSettleFeeSheetBo::getSheetType, - QueryCustomerSettleFeeSheetBo::getStatus, - QueryCustomerSettleFeeSheetBo::getSettleStatus); - } - - @Override - protected void afterInit(CustomerSettleFeeSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.sheetType = dto.getSheetType().getCode(); - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 单据类型 + */ + @ApiModelProperty("单据类型") + private Integer sheetType; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QueryCustomerSettleFeeSheetBo() { + + } + + public QueryCustomerSettleFeeSheetBo(CustomerSettleFeeSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleFeeSheet dto) { + + return super.convert(dto, QueryCustomerSettleFeeSheetBo::getSheetType, + QueryCustomerSettleFeeSheetBo::getStatus, + QueryCustomerSettleFeeSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(CustomerSettleFeeSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.sheetType = dto.getSheetType().getCode(); + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/GetSettleInItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/GetSettleInItemBo.java index 919c9a588b2500a49a5960d4d5aed21854a50272..337da2f1ca14fef2a13c4034cd3e088c32d9b6ce 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/GetSettleInItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/GetSettleInItemBo.java @@ -15,15 +15,15 @@ public class GetSettleInItemBo extends BaseBo { private String id; /** - * 岗位编号 + * 编号 */ - @ApiModelProperty("岗位编号") + @ApiModelProperty("编号") private String code; /** - * 岗位名称 + * 名称 */ - @ApiModelProperty("岗位名称") + @ApiModelProperty("名称") private String name; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/SettleInItemSelectorBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/SettleInItemSelectorBo.java index 144e2de56a65258ec576a1e0eb387fbd1a444c1b..0f17dc84899cfed21554fa89b3c735c07c5a9225 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/SettleInItemSelectorBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/in/SettleInItemSelectorBo.java @@ -15,15 +15,15 @@ public class SettleInItemSelectorBo extends BaseBo { private String id; /** - * 岗位编号 + * 编号 */ - @ApiModelProperty("岗位编号") + @ApiModelProperty("编号") private String code; /** - * 岗位名称 + * 名称 */ - @ApiModelProperty("岗位名称") + @ApiModelProperty("名称") private String name; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/GetSettleOutItemBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/GetSettleOutItemBo.java index 403be51a44a563d2a7593f2b21999b7e26479aa1..5254eb2ccc862bc0e0063eabb0f3a6ea91f33c99 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/GetSettleOutItemBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/GetSettleOutItemBo.java @@ -15,15 +15,15 @@ public class GetSettleOutItemBo extends BaseBo { private String id; /** - * 岗位编号 + * 编号 */ - @ApiModelProperty("岗位编号") + @ApiModelProperty("编号") private String code; /** - * 岗位名称 + * 名称 */ - @ApiModelProperty("岗位名称") + @ApiModelProperty("名称") private String name; /** diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/SettleOutItemSelectorBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/SettleOutItemSelectorBo.java index 21219bfa9a282b4d7cad2d871f42eeb01a72b17c..463917fe6147f502d71feee0e5da54d965c97226 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/SettleOutItemSelectorBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/item/out/SettleOutItemSelectorBo.java @@ -15,13 +15,13 @@ public class SettleOutItemSelectorBo extends BaseBo { private String id; /** - * 岗位编号 + * 编号 */ @ApiModelProperty("编号") private String code; /** - * 岗位名称 + * 名称 */ @ApiModelProperty("名称") private String name; diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/GetSettlePreSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/GetSettlePreSheetBo.java index d73e3a9149aa5ba45e7d2cbf70705ba7b224d18c..a307753687b81a6ec6ff03983872aff4e7bdfd21 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/GetSettlePreSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/GetSettlePreSheetBo.java @@ -4,14 +4,14 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.dto.pre.SettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.SettleOutItem; import com.lframework.xingyun.settle.service.SettleOutItemService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -22,168 +22,168 @@ import lombok.Data; @Data public class GetSettlePreSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetSettlePreSheetBo() { + + } + + public GetSettlePreSheetBo(SettlePreSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettlePreSheetFullDto dto) { + + return super.convert(dto, GetSettlePreSheetBo::getStatus, GetSettlePreSheetBo::getDetails); + } + + @Override + protected void afterInit(SettlePreSheetFullDto dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); + } + } - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; + @Data + public static class SheetDetailBo extends BaseBo { /** - * 创建时间 + * 明细ID */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("明细ID") + private String id; /** - * 审核时间 + * 项目ID */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; + @ApiModelProperty("项目ID") + private String itemId; /** - * 状态 + * 项目名称 */ - @ApiModelProperty("状态") - private Integer status; + @ApiModelProperty("项目名称") + private String itemName; /** - * 拒绝原因 + * 金额 */ - @ApiModelProperty("拒绝原因") - private String refuseReason; - - @ApiModelProperty("明细") - private List details; - - public GetSettlePreSheetBo() { - - } + @ApiModelProperty("金额") + private BigDecimal amount; - public GetSettlePreSheetBo(SettlePreSheetFullDto dto) { + public SheetDetailBo() { - super(dto); } - @Override - public BaseBo convert(SettlePreSheetFullDto dto) { + public SheetDetailBo(SettlePreSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetSettlePreSheetBo::getStatus, GetSettlePreSheetBo::getDetails); + super(dto); } @Override - protected void afterInit(SettlePreSheetFullDto dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 项目ID - */ - @ApiModelProperty("项目ID") - private String itemId; - - /** - * 项目名称 - */ - @ApiModelProperty("项目名称") - private String itemName; - - /** - * 金额 - */ - @ApiModelProperty("金额") - private BigDecimal amount; - - public SheetDetailBo() { - - } - - public SheetDetailBo(SettlePreSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - protected void afterInit(SettlePreSheetFullDto.SheetDetailDto dto) { + protected void afterInit(SettlePreSheetFullDto.SheetDetailDto dto) { - SettleOutItemService settleOutItemService = ApplicationUtil.getBean( - SettleOutItemService.class); - SettleOutItem item = settleOutItemService.findById(dto.getItemId()); - this.itemName = item.getName(); - } + SettleOutItemService settleOutItemService = ApplicationUtil.getBean( + SettleOutItemService.class); + SettleOutItem item = settleOutItemService.findById(dto.getItemId()); + this.itemName = item.getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/QuerySettlePreSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/QuerySettlePreSheetBo.java index e5987209addd0b7390ed17722c7e2956f83e83e0..48704f1e0f19adb4bd8b73673eb5ec4307394867 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/QuerySettlePreSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/QuerySettlePreSheetBo.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.settle.bo.pre; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.entity.SettlePreSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -17,116 +17,117 @@ import lombok.Data; @Data public class QuerySettlePreSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QuerySettlePreSheetBo() { - - } - - public QuerySettlePreSheetBo(SettlePreSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettlePreSheet dto) { - - return super.convert(dto, QuerySettlePreSheetBo::getStatus, QuerySettlePreSheetBo::getSettleStatus); - } - - @Override - protected void afterInit(SettlePreSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QuerySettlePreSheetBo() { + + } + + public QuerySettlePreSheetBo(SettlePreSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettlePreSheet dto) { + + return super.convert(dto, QuerySettlePreSheetBo::getStatus, + QuerySettlePreSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(SettlePreSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/GetCustomerSettlePreSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/GetCustomerSettlePreSheetBo.java index 7b630a962b03e1a6bfb4422925fd5a67b7bc58d8..078636c32da0ccc0f535f3815fada8a2ef0e28ae 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/GetCustomerSettlePreSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/GetCustomerSettlePreSheetBo.java @@ -4,14 +4,14 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFullDto; import com.lframework.xingyun.settle.entity.SettleInItem; import com.lframework.xingyun.settle.service.SettleInItemService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -22,170 +22,170 @@ import lombok.Data; @Data public class GetCustomerSettlePreSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetCustomerSettlePreSheetBo() { + + } + + public GetCustomerSettlePreSheetBo(CustomerSettlePreSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettlePreSheetFullDto dto) { + + return super.convert(dto, GetCustomerSettlePreSheetBo::getStatus, + GetCustomerSettlePreSheetBo::getDetails); + } + + @Override + protected void afterInit(CustomerSettlePreSheetFullDto dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new) + .collect(Collectors.toList()); + } + } - /** - * 创建人ID - */ - @ApiModelProperty("创建人ID") - private String createBy; + @Data + public static class SheetDetailBo extends BaseBo { /** - * 创建时间 + * 明细ID */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("明细ID") + private String id; /** - * 审核时间 + * 项目ID */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; + @ApiModelProperty("项目ID") + private String itemId; /** - * 状态 + * 项目名称 */ - @ApiModelProperty("状态") - private Integer status; + @ApiModelProperty("项目名称") + private String itemName; /** - * 拒绝原因 + * 金额 */ - @ApiModelProperty("拒绝原因") - private String refuseReason; - - @ApiModelProperty("明细") - private List details; - - public GetCustomerSettlePreSheetBo() { - - } + @ApiModelProperty("金额") + private BigDecimal amount; - public GetCustomerSettlePreSheetBo(CustomerSettlePreSheetFullDto dto) { + public SheetDetailBo() { - super(dto); } - @Override - public BaseBo convert(CustomerSettlePreSheetFullDto dto) { + public SheetDetailBo(CustomerSettlePreSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetCustomerSettlePreSheetBo::getStatus, - GetCustomerSettlePreSheetBo::getDetails); + super(dto); } @Override - protected void afterInit(CustomerSettlePreSheetFullDto dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new) - .collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 项目ID - */ - @ApiModelProperty("项目ID") - private String itemId; - - /** - * 项目名称 - */ - @ApiModelProperty("项目名称") - private String itemName; - - /** - * 金额 - */ - @ApiModelProperty("金额") - private BigDecimal amount; - - public SheetDetailBo() { - - } - - public SheetDetailBo(CustomerSettlePreSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - protected void afterInit(CustomerSettlePreSheetFullDto.SheetDetailDto dto) { + protected void afterInit(CustomerSettlePreSheetFullDto.SheetDetailDto dto) { - SettleInItemService settleInItemService = ApplicationUtil.getBean( - SettleInItemService.class); - SettleInItem item = settleInItemService.findById(dto.getItemId()); - this.itemName = item.getName(); - } + SettleInItemService settleInItemService = ApplicationUtil.getBean( + SettleInItemService.class); + SettleInItem item = settleInItemService.findById(dto.getItemId()); + this.itemName = item.getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/QueryCustomerSettlePreSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/QueryCustomerSettlePreSheetBo.java index b7db2611785a7f69e6060dea200419400a0b77a6..8fc690d5b2910ff4dcbd58c3cb0419e74ba27bd9 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/QueryCustomerSettlePreSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/pre/customer/QueryCustomerSettlePreSheetBo.java @@ -3,12 +3,12 @@ package com.lframework.xingyun.settle.bo.pre.customer; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -17,117 +17,117 @@ import lombok.Data; @Data public class QueryCustomerSettlePreSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - /** - * 结算状态 - */ - @ApiModelProperty("结算状态") - private Integer settleStatus; - - public QueryCustomerSettlePreSheetBo() { - - } - - public QueryCustomerSettlePreSheetBo(CustomerSettlePreSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettlePreSheet dto) { - - return super.convert(dto, QueryCustomerSettlePreSheetBo::getStatus, - QueryCustomerSettlePreSheetBo::getSettleStatus); - } - - @Override - protected void afterInit(CustomerSettlePreSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - this.settleStatus = dto.getSettleStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 结算状态 + */ + @ApiModelProperty("结算状态") + private Integer settleStatus; + + public QueryCustomerSettlePreSheetBo() { + + } + + public QueryCustomerSettlePreSheetBo(CustomerSettlePreSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettlePreSheet dto) { + + return super.convert(dto, QueryCustomerSettlePreSheetBo::getStatus, + QueryCustomerSettlePreSheetBo::getSettleStatus); + } + + @Override + protected void afterInit(CustomerSettlePreSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + this.settleStatus = dto.getSettleStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/GetSettleSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/GetSettleSheetBo.java index f5aaaf412d4d74e3ce1668b70c0aa9ad76541f29..ffd453e85f168a441d412ca1c5f54a32ea5aeeb5 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/GetSettleSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/GetSettleSheetBo.java @@ -5,14 +5,14 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.dto.sheet.SettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.SettleSheetFullDto; import com.lframework.xingyun.settle.service.SettleSheetService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -23,244 +23,245 @@ import lombok.Data; @Data public class GetSettleSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetSettleSheetBo() { + + } + + public GetSettleSheetBo(SettleSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleSheetFullDto dto) { + + return super.convert(dto, GetSettleSheetBo::getStatus, GetSettleSheetBo::getDetails); + } + + @Override + protected void afterInit(SettleSheetFullDto dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); + } + } - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; + @Data + public static class SheetDetailBo extends BaseBo { /** - * 总金额 + * 明细ID */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; + @ApiModelProperty("明细ID") + private String id; /** - * 优惠金额 + * 单据ID */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; + @ApiModelProperty("单据ID") + private String bizId; /** - * 起始时间 + * 单据号 */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; + @ApiModelProperty("单据号") + private String bizCode; /** - * 截止时间 + * 审核时间 */ - @ApiModelProperty("截止时间") + @ApiModelProperty("审核时间") @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; + private LocalDateTime approveTime; /** - * 备注 + * 应付金额 */ - @ApiModelProperty("备注") - private String description; + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; /** - * 创建人ID + * 已付金额 */ - @ApiModelProperty("创建人ID") - private String createBy; + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; /** - * 创建时间 + * 已优惠金额 */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; + @ApiModelProperty("已优惠金额") + private BigDecimal totalDiscountAmount; /** - * 审核人 + * 未付金额 */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; /** - * 审核时间 + * 实付金额 */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; + @ApiModelProperty("实付金额") + private BigDecimal payAmount; /** - * 状态 + * 优惠金额 */ - @ApiModelProperty("状态") - private Integer status; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; /** - * 拒绝原因 + * 单据备注 */ - @ApiModelProperty("拒绝原因") - private String refuseReason; - - @ApiModelProperty("明细") - private List details; + @ApiModelProperty("单据备注") + private String description; - public GetSettleSheetBo() { + public SheetDetailBo() { } - public GetSettleSheetBo(SettleSheetFullDto dto) { + public SheetDetailBo(SettleSheetFullDto.SheetDetailDto dto) { - super(dto); + super(dto); } @Override - public BaseBo convert(SettleSheetFullDto dto) { + public BaseBo convert( + SettleSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetSettleSheetBo::getStatus, GetSettleSheetBo::getDetails); + return super.convert(dto); } @Override - protected void afterInit(SettleSheetFullDto dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new).collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 单据ID - */ - @ApiModelProperty("单据ID") - private String bizId; - - /** - * 单据号 - */ - @ApiModelProperty("单据号") - private String bizCode; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; - - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; - - /** - * 已优惠金额 - */ - @ApiModelProperty("已优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; - - /** - * 实付金额 - */ - @ApiModelProperty("实付金额") - private BigDecimal payAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal discountAmount; - - /** - * 单据备注 - */ - @ApiModelProperty("单据备注") - private String description; - - public SheetDetailBo() { - - } - - public SheetDetailBo(SettleSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleSheetFullDto.SheetDetailDto dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(SettleSheetFullDto.SheetDetailDto dto) { - - SettleSheetService settleSheetService = ApplicationUtil.getBean(SettleSheetService.class); - SettleBizItemDto item = settleSheetService.getBizItem(dto.getBizId()); - this.bizCode = item.getCode(); - this.approveTime = item.getApproveTime(); - this.totalPayAmount = item.getTotalPayAmount(); - this.totalPayedAmount = item.getTotalPayedAmount(); - this.totalDiscountAmount = item.getTotalDiscountAmount(); - this.totalUnPayAmount = item.getTotalUnPayAmount(); - } + protected void afterInit(SettleSheetFullDto.SheetDetailDto dto) { + + SettleSheetService settleSheetService = ApplicationUtil.getBean(SettleSheetService.class); + SettleBizItemDto item = settleSheetService.getBizItem(dto.getBizId()); + this.bizCode = item.getCode(); + this.approveTime = item.getApproveTime(); + this.totalPayAmount = item.getTotalPayAmount(); + this.totalPayedAmount = item.getTotalPayedAmount(); + this.totalDiscountAmount = item.getTotalDiscountAmount(); + this.totalUnPayAmount = item.getTotalUnPayAmount(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/QuerySettleSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/QuerySettleSheetBo.java index 86758c4d11a035b73fb8eed3e18bf5609ec6d6a3..01c2a788bde6c6bb41e9aa833c38011dd6a59c68 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/QuerySettleSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/QuerySettleSheetBo.java @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; import com.lframework.xingyun.settle.entity.SettleSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -18,132 +18,132 @@ import lombok.Data; @Data public class QuerySettleSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 供应商ID - */ - @ApiModelProperty("供应商ID") - private String supplierId; - - /** - * 供应商编号 - */ - @ApiModelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ApiModelProperty("供应商名称") - private String supplierName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; - - /** - * 截止时间 - */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - public QuerySettleSheetBo() { - - } - - public QuerySettleSheetBo(SettleSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleSheet dto) { - - return super.convert(dto, QuerySettleSheetBo::getStatus); + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 供应商ID + */ + @ApiModelProperty("供应商ID") + private String supplierId; + + /** + * 供应商编号 + */ + @ApiModelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ApiModelProperty("供应商名称") + private String supplierName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + public QuerySettleSheetBo() { + + } + + public QuerySettleSheetBo(SettleSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleSheet dto) { + + return super.convert(dto, QuerySettleSheetBo::getStatus); + } + + @Override + protected void afterInit(SettleSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + this.supplierCode = supplier.getCode(); + this.supplierName = supplier.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } - @Override - protected void afterInit(SettleSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - this.supplierCode = supplier.getCode(); - this.supplierName = supplier.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - } + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/GetCustomerSettleSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/GetCustomerSettleSheetBo.java index 7928ebe2aff29ffd8aa263952445ba5cc590c14b..c36874a68dc439f8c517ce170f307e351d61ad93 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/GetCustomerSettleSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/GetCustomerSettleSheetBo.java @@ -5,14 +5,14 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleSheetFullDto; import com.lframework.xingyun.settle.service.CustomerSettleSheetService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -23,248 +23,248 @@ import lombok.Data; @Data public class GetCustomerSettleSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人ID + */ + @ApiModelProperty("创建人ID") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + /** + * 拒绝原因 + */ + @ApiModelProperty("拒绝原因") + private String refuseReason; + + @ApiModelProperty("明细") + private List details; + + public GetCustomerSettleSheetBo() { + + } + + public GetCustomerSettleSheetBo(CustomerSettleSheetFullDto dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleSheetFullDto dto) { + + return super.convert(dto, GetCustomerSettleSheetBo::getStatus, + GetCustomerSettleSheetBo::getDetails); + } + + @Override + protected void afterInit(CustomerSettleSheetFullDto dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); + } - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; + if (!CollectionUtil.isEmpty(dto.getDetails())) { + this.details = dto.getDetails().stream().map(SheetDetailBo::new) + .collect(Collectors.toList()); + } + } - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; + @Data + public static class SheetDetailBo extends BaseBo { /** - * 总金额 + * 明细ID */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; + @ApiModelProperty("明细ID") + private String id; /** - * 优惠金额 + * 单据ID */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; + @ApiModelProperty("单据ID") + private String bizId; /** - * 起始时间 + * 单据号 */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; + @ApiModelProperty("单据号") + private String bizCode; /** - * 截止时间 + * 审核时间 */ - @ApiModelProperty("截止时间") + @ApiModelProperty("审核时间") @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; + private LocalDateTime approveTime; /** - * 备注 + * 应付金额 */ - @ApiModelProperty("备注") - private String description; + @ApiModelProperty("应付金额") + private BigDecimal totalPayAmount; /** - * 创建人ID + * 已付金额 */ - @ApiModelProperty("创建人ID") - private String createBy; + @ApiModelProperty("已付金额") + private BigDecimal totalPayedAmount; /** - * 创建时间 + * 已优惠金额 */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; + @ApiModelProperty("已优惠金额") + private BigDecimal totalDiscountAmount; /** - * 审核人 + * 未付金额 */ - @ApiModelProperty("审核人") - private String approveBy; + @ApiModelProperty("未付金额") + private BigDecimal totalUnPayAmount; /** - * 审核时间 + * 实付金额 */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; + @ApiModelProperty("实付金额") + private BigDecimal payAmount; /** - * 状态 + * 优惠金额 */ - @ApiModelProperty("状态") - private Integer status; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; /** - * 拒绝原因 + * 单据备注 */ - @ApiModelProperty("拒绝原因") - private String refuseReason; - - @ApiModelProperty("明细") - private List details; + @ApiModelProperty("单据备注") + private String description; - public GetCustomerSettleSheetBo() { + public SheetDetailBo() { } - public GetCustomerSettleSheetBo(CustomerSettleSheetFullDto dto) { + public SheetDetailBo(CustomerSettleSheetFullDto.SheetDetailDto dto) { - super(dto); + super(dto); } @Override - public BaseBo convert(CustomerSettleSheetFullDto dto) { + public BaseBo convert( + CustomerSettleSheetFullDto.SheetDetailDto dto) { - return super.convert(dto, GetCustomerSettleSheetBo::getStatus, - GetCustomerSettleSheetBo::getDetails); + return super.convert(dto); } @Override - protected void afterInit(CustomerSettleSheetFullDto dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - - if (!CollectionUtil.isEmpty(dto.getDetails())) { - this.details = dto.getDetails().stream().map(SheetDetailBo::new) - .collect(Collectors.toList()); - } - } - - @Data - public static class SheetDetailBo extends BaseBo { - - /** - * 明细ID - */ - @ApiModelProperty("明细ID") - private String id; - - /** - * 单据ID - */ - @ApiModelProperty("单据ID") - private String bizId; - - /** - * 单据号 - */ - @ApiModelProperty("单据号") - private String bizCode; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 应付金额 - */ - @ApiModelProperty("应付金额") - private BigDecimal totalPayAmount; - - /** - * 已付金额 - */ - @ApiModelProperty("已付金额") - private BigDecimal totalPayedAmount; - - /** - * 已优惠金额 - */ - @ApiModelProperty("已优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付金额 - */ - @ApiModelProperty("未付金额") - private BigDecimal totalUnPayAmount; - - /** - * 实付金额 - */ - @ApiModelProperty("实付金额") - private BigDecimal payAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal discountAmount; - - /** - * 单据备注 - */ - @ApiModelProperty("单据备注") - private String description; - - public SheetDetailBo() { - - } - - public SheetDetailBo(CustomerSettleSheetFullDto.SheetDetailDto dto) { - - super(dto); - } - - @Override - public BaseBo convert( - CustomerSettleSheetFullDto.SheetDetailDto dto) { - - return super.convert(dto); - } - - @Override - protected void afterInit(CustomerSettleSheetFullDto.SheetDetailDto dto) { - - CustomerSettleSheetService settleSheetService = ApplicationUtil.getBean( - CustomerSettleSheetService.class); - CustomerSettleBizItemDto item = settleSheetService.getBizItem(dto.getBizId()); - this.bizCode = item.getCode(); - this.approveTime = item.getApproveTime(); - this.totalPayAmount = item.getTotalPayAmount(); - this.totalPayedAmount = item.getTotalPayedAmount(); - this.totalDiscountAmount = item.getTotalDiscountAmount(); - this.totalUnPayAmount = item.getTotalUnPayAmount(); - } + protected void afterInit(CustomerSettleSheetFullDto.SheetDetailDto dto) { + + CustomerSettleSheetService settleSheetService = ApplicationUtil.getBean( + CustomerSettleSheetService.class); + CustomerSettleBizItemDto item = settleSheetService.getBizItem(dto.getBizId()); + this.bizCode = item.getCode(); + this.approveTime = item.getApproveTime(); + this.totalPayAmount = item.getTotalPayAmount(); + this.totalPayedAmount = item.getTotalPayedAmount(); + this.totalDiscountAmount = item.getTotalDiscountAmount(); + this.totalUnPayAmount = item.getTotalUnPayAmount(); } + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/QueryCustomerSettleSheetBo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/QueryCustomerSettleSheetBo.java index 85d56d8d3db192d68fedf64bf221c8e734312a57..ae89167eca61eb9108c2d088e180f7754bf5e17c 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/QueryCustomerSettleSheetBo.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/bo/sheet/customer/QueryCustomerSettleSheetBo.java @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; import com.lframework.xingyun.settle.entity.CustomerSettleSheet; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -18,132 +18,132 @@ import lombok.Data; @Data public class QueryCustomerSettleSheetBo extends BaseBo { - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 单号 - */ - @ApiModelProperty("单号") - private String code; - - /** - * 客户ID - */ - @ApiModelProperty("客户ID") - private String customerId; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 总金额 - */ - @ApiModelProperty("总金额") - private BigDecimal totalAmount; - - /** - * 优惠金额 - */ - @ApiModelProperty("优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 起始时间 - */ - @ApiModelProperty("起始时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime startTime; - - /** - * 截止时间 - */ - @ApiModelProperty("截止时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime endTime; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - /** - * 创建人 - */ - @ApiModelProperty("创建人") - private String createBy; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime createTime; - - /** - * 审核人 - */ - @ApiModelProperty("审核人") - private String approveBy; - - /** - * 审核时间 - */ - @ApiModelProperty("审核时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime approveTime; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Integer status; - - public QueryCustomerSettleSheetBo() { - - } - - public QueryCustomerSettleSheetBo(CustomerSettleSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleSheet dto) { - - return super.convert(dto, QueryCustomerSettleSheetBo::getStatus); + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 单号 + */ + @ApiModelProperty("单号") + private String code; + + /** + * 客户ID + */ + @ApiModelProperty("客户ID") + private String customerId; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 总金额 + */ + @ApiModelProperty("总金额") + private BigDecimal totalAmount; + + /** + * 优惠金额 + */ + @ApiModelProperty("优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 起始时间 + */ + @ApiModelProperty("起始时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime startTime; + + /** + * 截止时间 + */ + @ApiModelProperty("截止时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime endTime; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 审核人 + */ + @ApiModelProperty("审核人") + private String approveBy; + + /** + * 审核时间 + */ + @ApiModelProperty("审核时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime approveTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Integer status; + + public QueryCustomerSettleSheetBo() { + + } + + public QueryCustomerSettleSheetBo(CustomerSettleSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleSheet dto) { + + return super.convert(dto, QueryCustomerSettleSheetBo::getStatus); + } + + @Override + protected void afterInit(CustomerSettleSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + this.customerCode = customer.getCode(); + this.customerName = customer.getName(); + + this.status = dto.getStatus().getCode(); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + + if (!StringUtil.isBlank(dto.getApproveBy())) { + this.approveBy = userService.findById(dto.getApproveBy()).getName(); } - @Override - protected void afterInit(CustomerSettleSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - this.customerCode = customer.getCode(); - this.customerName = customer.getName(); - - this.status = dto.getStatus().getCode(); - - UserService userService = ApplicationUtil.getBean(UserService.class); - - if (!StringUtil.isBlank(dto.getApproveBy())) { - this.approveBy = userService.findById(dto.getApproveBy()).getName(); - } - - this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); - this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); - } + this.startTime = DateUtil.toLocalDateTime(dto.getStartDate()); + this.endTime = DateUtil.toLocalDateTimeMax(dto.getEndDate()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/components/code/GenerateCodeTypePool.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/components/code/GenerateCodeTypePool.java index 5fd6003acbeaff7c41c2f3f187d7156d13de9327..4d4f7d3421519b392b5c222e17121a243f598590 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/components/code/GenerateCodeTypePool.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/components/code/GenerateCodeTypePool.java @@ -1,46 +1,44 @@ package com.lframework.xingyun.settle.components.code; -import com.lframework.starter.web.components.code.GenerateCodeType; - public interface GenerateCodeTypePool { /** * 对账单 */ - GenerateCodeType SETTLE_CHECK_SHEET = GenerateCodeType.FLOW; + Integer SETTLE_CHECK_SHEET = 300; /** * 费用单 */ - GenerateCodeType SETTLE_FEE_SHEET = GenerateCodeType.FLOW; + Integer SETTLE_FEE_SHEET = 301; /** * 预付款单 */ - GenerateCodeType SETTLE_PRE_SHEET = GenerateCodeType.FLOW; + Integer SETTLE_PRE_SHEET = 302; /** * 结算单 */ - GenerateCodeType SETTLE_SHEET = GenerateCodeType.FLOW; + Integer SETTLE_SHEET = 303; /** * 客户对账单 */ - GenerateCodeType CUSTOMER_SETTLE_CHECK_SHEET = GenerateCodeType.FLOW; + Integer CUSTOMER_SETTLE_CHECK_SHEET = 304; /** * 客户费用单 */ - GenerateCodeType CUSTOMER_SETTLE_FEE_SHEET = GenerateCodeType.FLOW; + Integer CUSTOMER_SETTLE_FEE_SHEET = 305; /** * 客户预付款单 */ - GenerateCodeType CUSTOMER_SETTLE_PRE_SHEET = GenerateCodeType.FLOW; + Integer CUSTOMER_SETTLE_PRE_SHEET = 306; /** * 客户结算单 */ - GenerateCodeType CUSTOMER_SETTLE_SHEET = GenerateCodeType.FLOW; + Integer CUSTOMER_SETTLE_SHEET = 307; } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleCheckSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleCheckSheetController.java index 19345557947df2619f43d8b93820a1589d673e57..93618307e0b9c1255df21a298ac6989bea0b04fb 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleCheckSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleCheckSheetController.java @@ -18,8 +18,6 @@ import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheet; import com.lframework.xingyun.settle.service.CustomerSettleCheckSheetService; import com.lframework.xingyun.settle.vo.check.customer.ApprovePassCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.ApproveRefuseCustomerSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.customer.BatchApprovePassCustomerSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.customer.BatchApproveRefuseCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.CreateCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.QueryCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.QueryCustomerUnCheckBizItemVo; @@ -27,12 +25,10 @@ import com.lframework.xingyun.settle.vo.check.customer.UpdateCustomerSettleCheck import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -175,20 +171,6 @@ public class CustomerSettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过客户对账单 - */ - @ApiOperation("批量审核通过客户对账单") - @HasPermission({"customer-settle:check-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass( - @RequestBody @Valid BatchApprovePassCustomerSettleCheckSheetVo vo) { - - customerSettleCheckSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过客户对账单 */ @@ -217,20 +199,6 @@ public class CustomerSettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝客户对账单 - */ - @ApiOperation("批量审核拒绝客户对账单") - @HasPermission({"customer-settle:check-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse( - @RequestBody @Valid BatchApproveRefuseCustomerSettleCheckSheetVo vo) { - - customerSettleCheckSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除客户对账单 */ @@ -245,20 +213,6 @@ public class CustomerSettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量删除客户对账单 - */ - @ApiOperation("批量删除客户对账单") - @HasPermission({"customer-settle:check-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的客户对账单！") List ids) { - - customerSettleCheckSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } - /** * 查询未对账的业务单据 */ diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleFeeSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleFeeSheetController.java index dbfa2040e90d52c467ad3dfd992c0d8dd39361e7..4ee32179fd868d2225827e944d535a7d68759a11 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleFeeSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleFeeSheetController.java @@ -16,20 +16,16 @@ import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; import com.lframework.xingyun.settle.service.CustomerSettleFeeSheetService; import com.lframework.xingyun.settle.vo.fee.customer.ApprovePassCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.ApproveRefuseCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApprovePassCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApproveRefuseCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.CreateCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.QueryCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.UpdateCustomerSettleFeeSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -172,20 +168,6 @@ public class CustomerSettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过客户费用单 - */ - @ApiOperation("批量审核通过客户费用单") - @HasPermission({"customer-settle:fee-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass( - @RequestBody @Valid BatchApprovePassCustomerSettleFeeSheetVo vo) { - - customerSettleFeeSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过客户费用单 */ @@ -214,20 +196,6 @@ public class CustomerSettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝客户费用单 - */ - @ApiOperation("批量审核拒绝客户费用单") - @HasPermission({"customer-settle:fee-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse( - @RequestBody @Valid BatchApproveRefuseCustomerSettleFeeSheetVo vo) { - - customerSettleFeeSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除客户费用单 */ @@ -241,18 +209,4 @@ public class CustomerSettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - - /** - * 批量删除客户费用单 - */ - @ApiOperation("批量删除客户费用单") - @HasPermission({"customer-settle:fee-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的客户费用单！") List ids) { - - customerSettleFeeSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettlePreSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettlePreSheetController.java index dad1111b254ea4efd1ab065a86b5b72a6ac0c339..af4857a220fc82b05a0050af92a8967cc42b362b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettlePreSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettlePreSheetController.java @@ -16,20 +16,16 @@ import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; import com.lframework.xingyun.settle.service.CustomerSettlePreSheetService; import com.lframework.xingyun.settle.vo.pre.customer.ApprovePassCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.ApproveRefuseCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApprovePassCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApproveRefuseCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.CreateCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.QueryCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.UpdateCustomerSettlePreSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -172,20 +168,6 @@ public class CustomerSettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过客户预付款单 - */ - @ApiOperation("批量审核通过客户预付款单") - @HasPermission({"customer-settle:pre-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass( - @RequestBody @Valid BatchApprovePassCustomerSettlePreSheetVo vo) { - - settlePreSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过客户预付款单 */ @@ -214,20 +196,6 @@ public class CustomerSettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝客户预付款单 - */ - @ApiOperation("批量审核拒绝客户预付款单") - @HasPermission({"customer-settle:pre-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse( - @RequestBody @Valid BatchApproveRefuseCustomerSettlePreSheetVo vo) { - - settlePreSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除客户预付款单 */ @@ -241,18 +209,4 @@ public class CustomerSettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - - /** - * 批量删除客户预付款单 - */ - @ApiOperation("批量删除客户预付款单") - @HasPermission({"customer-settle:pre-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的客户预付款单！") List ids) { - - settlePreSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleSheetController.java index 6b0fe615624e9effc1fe448a5f5ee17aea978357..863e507279f34186fb12536381f7cfbe1e7cf14e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/CustomerSettleSheetController.java @@ -18,8 +18,6 @@ import com.lframework.xingyun.settle.entity.CustomerSettleSheet; import com.lframework.xingyun.settle.service.CustomerSettleSheetService; import com.lframework.xingyun.settle.vo.sheet.customer.ApprovePassCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.ApproveRefuseCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApprovePassCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApproveRefuseCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.CreateCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerUnSettleBizItemVo; @@ -27,12 +25,10 @@ import com.lframework.xingyun.settle.vo.sheet.customer.UpdateCustomerSettleSheet import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -174,20 +170,6 @@ public class CustomerSettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过客户结算单 - */ - @ApiOperation("批量审核通过客户结算单") - @HasPermission({"customer-settle:sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass( - @RequestBody @Valid BatchApprovePassCustomerSettleSheetVo vo) { - - customerSettleSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过客户结算单 */ @@ -216,20 +198,6 @@ public class CustomerSettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝客户结算单 - */ - @ApiOperation("批量审核拒绝客户结算单") - @HasPermission({"customer-settle:sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse( - @RequestBody @Valid BatchApproveRefuseCustomerSettleSheetVo vo) { - - customerSettleSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除客户结算单 */ @@ -244,20 +212,6 @@ public class CustomerSettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量删除客户结算单 - */ - @ApiOperation("批量删除客户结算单") - @HasPermission({"customer-settle:sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的客户结算单！") List ids) { - - customerSettleSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } - /** * 查询未结算的业务单据 */ diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleCheckSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleCheckSheetController.java index 02140e2c96f614244cf494c9d8f0c7395bd509fc..1274d91014121b294b22f6656320e739f500f944 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleCheckSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleCheckSheetController.java @@ -18,8 +18,6 @@ import com.lframework.xingyun.settle.entity.SettleCheckSheet; import com.lframework.xingyun.settle.service.SettleCheckSheetService; import com.lframework.xingyun.settle.vo.check.ApprovePassSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.ApproveRefuseSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.BatchApprovePassSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.BatchApproveRefuseSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.CreateSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.QuerySettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.QueryUnCheckBizItemVo; @@ -27,12 +25,10 @@ import com.lframework.xingyun.settle.vo.check.UpdateSettleCheckSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -168,19 +164,6 @@ public class SettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过供应商对账单 - */ - @ApiOperation("批量审核通过供应商对账单") - @HasPermission({"settle:check-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass(@RequestBody @Valid BatchApprovePassSettleCheckSheetVo vo) { - - settleCheckSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过供应商对账单 */ @@ -207,19 +190,6 @@ public class SettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝供应商对账单 - */ - @ApiOperation("批量审核拒绝供应商对账单") - @HasPermission({"settle:check-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse(@RequestBody @Valid BatchApproveRefuseSettleCheckSheetVo vo) { - - settleCheckSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除供应商对账单 */ @@ -234,20 +204,6 @@ public class SettleCheckSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量删除供应商对账单 - */ - @ApiOperation("批量删除供应商对账单") - @HasPermission({"settle:check-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的供应商对账单！") List ids) { - - settleCheckSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } - /** * 查询未对账的业务单据 */ diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleFeeSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleFeeSheetController.java index 1db988c79c113011785941dc290b928f6536edbc..68f6344d2f77fd2b763558ab2021a63abd6a0151 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleFeeSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleFeeSheetController.java @@ -16,20 +16,16 @@ import com.lframework.xingyun.settle.entity.SettleFeeSheet; import com.lframework.xingyun.settle.service.SettleFeeSheetService; import com.lframework.xingyun.settle.vo.fee.ApprovePassSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.ApproveRefuseSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.BatchApprovePassSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.BatchApproveRefuseSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.CreateSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.QuerySettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.UpdateSettleFeeSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -165,19 +161,6 @@ public class SettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过供应商费用单 - */ - @ApiOperation("批量审核通过供应商费用单") - @HasPermission({"settle:fee-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass(@RequestBody @Valid BatchApprovePassSettleFeeSheetVo vo) { - - settleFeeSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过供应商费用单 */ @@ -204,19 +187,6 @@ public class SettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝供应商费用单 - */ - @ApiOperation("批量审核拒绝供应商费用单") - @HasPermission({"settle:fee-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse(@RequestBody @Valid BatchApproveRefuseSettleFeeSheetVo vo) { - - settleFeeSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除供应商费用单 */ @@ -230,18 +200,4 @@ public class SettleFeeSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - - /** - * 批量删除供应商费用单 - */ - @ApiOperation("批量删除供应商费用单") - @HasPermission({"settle:fee-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的供应商费用单！") List ids) { - - settleFeeSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleInItemController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleInItemController.java index 0829e876a8811afbbb9efdb07060fe4fe3a4e9fe..5fb312ef4a55c8638882acde544d69421bf8e464 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleInItemController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleInItemController.java @@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -121,37 +120,33 @@ public class SettleInItemController extends DefaultBaseController { } /** - * 批量停用收入项目 + * 停用收入项目 */ - @ApiOperation("批量停用收入项目") + @ApiOperation("停用收入项目") @HasPermission({"settle:in-item:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的收入项目！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "收入项目ID不能为空！") String id) { - settleInItemService.batchUnable(ids); + settleInItemService.unable(id); - for (String id : ids) { - settleInItemService.cleanCacheByKey(id); - } + settleInItemService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用收入项目 + * 启用收入项目 */ - @ApiOperation("批量启用收入项目") + @ApiOperation("启用收入项目") @HasPermission({"settle:in-item:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的收入项目！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "收入项目ID不能为空！") String id) { - settleInItemService.batchEnable(ids); + settleInItemService.enable(id); - for (String id : ids) { - settleInItemService.cleanCacheByKey(id); - } + settleInItemService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleOutItemController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleOutItemController.java index 1d9a28fd163190f782aeb76080e840dd6e0cfdc9..e6f6c157ff5099c029e52d0f86ac154023f5beee 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleOutItemController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleOutItemController.java @@ -121,37 +121,33 @@ public class SettleOutItemController extends DefaultBaseController { } /** - * 批量停用支出项目 + * 停用支出项目 */ - @ApiOperation("批量停用支出项目") + @ApiOperation("停用支出项目") @HasPermission({"settle:out-item:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要停用的支出项目！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "支出项目ID不能为空！") String id) { - settleOutItemService.batchUnable(ids); + settleOutItemService.unable(id); - for (String id : ids) { - settleOutItemService.cleanCacheByKey(id); - } + settleOutItemService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用支出项目 + * 启用支出项目 */ - @ApiOperation("批量启用支出项目") + @ApiOperation("启用支出项目") @HasPermission({"settle:out-item:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @NotEmpty(message = "请选择需要启用的支出项目！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "支出项目ID不能为空！") String id) { - settleOutItemService.batchEnable(ids); + settleOutItemService.enable(id); - for (String id : ids) { - settleOutItemService.cleanCacheByKey(id); - } + settleOutItemService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettlePreSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettlePreSheetController.java index c4866bf657b6e5f7235a96c2e432b1d98b98b4ea..c088b9d263ace20d5778d8b4ed1649254d6f8f22 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettlePreSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettlePreSheetController.java @@ -16,20 +16,16 @@ import com.lframework.xingyun.settle.entity.SettlePreSheet; import com.lframework.xingyun.settle.service.SettlePreSheetService; import com.lframework.xingyun.settle.vo.pre.ApprovePassSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.ApproveRefuseSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.BatchApprovePassSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.BatchApproveRefuseSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.CreateSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.QuerySettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.UpdateSettlePreSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; @@ -165,19 +161,6 @@ public class SettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过供应商预付款单 - */ - @ApiOperation("批量审核通过供应商预付款单") - @HasPermission({"settle:pre-sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass(@RequestBody @Valid BatchApprovePassSettlePreSheetVo vo) { - - settlePreSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过供应商预付款单 */ @@ -204,19 +187,6 @@ public class SettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝供应商预付款单 - */ - @ApiOperation("批量审核拒绝供应商预付款单") - @HasPermission({"settle:pre-sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse(@RequestBody @Valid BatchApproveRefuseSettlePreSheetVo vo) { - - settlePreSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除供应商预付款单 */ @@ -230,18 +200,4 @@ public class SettlePreSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - - /** - * 批量删除供应商预付款单 - */ - @ApiOperation("批量删除供应商预付款单") - @HasPermission({"settle:pre-sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的供应商预付款单！") List ids) { - - settlePreSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSheetController.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSheetController.java index 1aa7e3243c8403d3264fc0ebccc0e822f1dd0629..40da1520e77bc8306356962cd55e0fb99091d043 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSheetController.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/controller/SettleSheetController.java @@ -1,25 +1,24 @@ package com.lframework.xingyun.settle.controller; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.components.excel.ExcelMultipartWriterSheetBuilder; +import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.ExcelUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.settle.bo.sheet.GetSettleSheetBo; import com.lframework.xingyun.settle.bo.sheet.QuerySettleSheetBo; import com.lframework.xingyun.settle.bo.sheet.SettleBizItemBo; -import com.lframework.xingyun.settle.excel.sheet.SettleSheetExportModel; import com.lframework.xingyun.settle.dto.sheet.SettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.SettleSheetFullDto; import com.lframework.xingyun.settle.entity.SettleSheet; +import com.lframework.xingyun.settle.excel.sheet.SettleSheetExportModel; import com.lframework.xingyun.settle.service.SettleSheetService; import com.lframework.xingyun.settle.vo.sheet.ApprovePassSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.ApproveRefuseSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.BatchApprovePassSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.BatchApproveRefuseSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.CreateSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.QuerySettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.QueryUnSettleBizItemVo; @@ -27,14 +26,11 @@ import com.lframework.xingyun.settle.vo.sheet.UpdateSettleSheetVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; -import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -168,19 +164,6 @@ public class SettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核通过供应商结算单 - */ - @ApiOperation("批量审核通过供应商结算单") - @HasPermission({"settle:sheet:approve"}) - @PatchMapping("/approve/pass/batch") - public InvokeResult batchApprovePass(@RequestBody @Valid BatchApprovePassSettleSheetVo vo) { - - settleSheetService.batchApprovePass(vo); - - return InvokeResultBuilder.success(); - } - /** * 直接审核通过供应商结算单 */ @@ -207,19 +190,6 @@ public class SettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量审核拒绝供应商结算单 - */ - @ApiOperation("批量审核拒绝供应商结算单") - @HasPermission({"settle:sheet:approve"}) - @PatchMapping("/approve/refuse/batch") - public InvokeResult batchApproveRefuse(@RequestBody @Valid BatchApproveRefuseSettleSheetVo vo) { - - settleSheetService.batchApproveRefuse(vo); - - return InvokeResultBuilder.success(); - } - /** * 删除供应商结算单 */ @@ -234,20 +204,6 @@ public class SettleSheetController extends DefaultBaseController { return InvokeResultBuilder.success(); } - /** - * 批量删除供应商结算单 - */ - @ApiOperation("批量删除供应商结算单") - @HasPermission({"settle:sheet:delete"}) - @DeleteMapping("/batch") - public InvokeResult deleteByIds( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "请选择需要删除的供应商结算单！") List ids) { - - settleSheetService.deleteByIds(ids); - - return InvokeResultBuilder.success(); - } - /** * 查询未结算的业务单据 */ diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportModel.java index 24d89b6a6902965dfbeafccc3ad119a2e9f9b422..1f592a1ad8d5f85bf73fb5041fb640d6e4c77a50 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/SettleCheckSheetExportModel.java @@ -6,17 +6,17 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.SettleCheckSheet; import com.lframework.xingyun.settle.enums.SettleCheckSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -24,144 +24,145 @@ import lombok.Data; @Data public class SettleCheckSheetExportModel extends BaseBo implements ExcelModel { - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 供应商编号 - */ - @ExcelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ExcelProperty("供应商名称") - private String supplierName; - - /** - * 单据金额 - */ - @ExcelProperty("单据金额") - private BigDecimal totalAmount; - - /** - * 应付总金额 - */ - @ExcelProperty("应付总金额") - private BigDecimal totalPayAmount; - - /** - * 已付款金额 - */ - @ExcelProperty("已付款金额") - private BigDecimal totalPayedAmount; - - /** - * 已优惠金额 - */ - @ExcelProperty("已优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付款金额 - */ - @ExcelProperty("未付款金额") - private BigDecimal totalUnPayAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public SettleCheckSheetExportModel() { - + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 供应商编号 + */ + @ExcelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty("供应商名称") + private String supplierName; + + /** + * 单据金额 + */ + @ExcelProperty("单据金额") + private BigDecimal totalAmount; + + /** + * 应付总金额 + */ + @ExcelProperty("应付总金额") + private BigDecimal totalPayAmount; + + /** + * 已付款金额 + */ + @ExcelProperty("已付款金额") + private BigDecimal totalPayedAmount; + + /** + * 已优惠金额 + */ + @ExcelProperty("已优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付款金额 + */ + @ExcelProperty("未付款金额") + private BigDecimal totalUnPayAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public SettleCheckSheetExportModel() { + + } + + public SettleCheckSheetExportModel(SettleCheckSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleCheckSheet dto) { + + return this; + } + + @Override + protected void afterInit(SettleCheckSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public SettleCheckSheetExportModel(SettleCheckSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleCheckSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setSupplierCode(supplier.getCode()); + this.setSupplierName(supplier.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setTotalPayAmount(dto.getTotalPayAmount()); + this.setTotalPayedAmount(dto.getTotalPayedAmount()); + this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); + this.setTotalUnPayAmount( + NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount())); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(SettleCheckSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(SettleCheckSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setSupplierCode(supplier.getCode()); - this.setSupplierName(supplier.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setTotalPayAmount(dto.getTotalPayAmount()); - this.setTotalPayedAmount(dto.getTotalPayedAmount()); - this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); - this.setTotalUnPayAmount( - NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), dto.getTotalDiscountAmount())); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(SettleCheckSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportModel.java index 5393bab59fec0b10fb3acb8fd8309a6a11945f12..785edeb507e05245e132c95958d6df59c08ad3d7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/check/customer/CustomerSettleCheckSheetExportModel.java @@ -6,17 +6,17 @@ import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.CustomerSettleCheckSheet; import com.lframework.xingyun.settle.enums.CustomerSettleCheckSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; @@ -24,147 +24,147 @@ import lombok.Data; @Data public class CustomerSettleCheckSheetExportModel extends BaseBo implements - ExcelModel { - - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 单据金额 - */ - @ExcelProperty("单据金额") - private BigDecimal totalAmount; - - /** - * 应付总金额 - */ - @ExcelProperty("应付总金额") - private BigDecimal totalPayAmount; - - /** - * 已付款金额 - */ - @ExcelProperty("已付款金额") - private BigDecimal totalPayedAmount; - - /** - * 已优惠金额 - */ - @ExcelProperty("已优惠金额") - private BigDecimal totalDiscountAmount; - - /** - * 未付款金额 - */ - @ExcelProperty("未付款金额") - private BigDecimal totalUnPayAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public CustomerSettleCheckSheetExportModel() { - + ExcelModel { + + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 单据金额 + */ + @ExcelProperty("单据金额") + private BigDecimal totalAmount; + + /** + * 应付总金额 + */ + @ExcelProperty("应付总金额") + private BigDecimal totalPayAmount; + + /** + * 已付款金额 + */ + @ExcelProperty("已付款金额") + private BigDecimal totalPayedAmount; + + /** + * 已优惠金额 + */ + @ExcelProperty("已优惠金额") + private BigDecimal totalDiscountAmount; + + /** + * 未付款金额 + */ + @ExcelProperty("未付款金额") + private BigDecimal totalUnPayAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public CustomerSettleCheckSheetExportModel() { + + } + + public CustomerSettleCheckSheetExportModel(CustomerSettleCheckSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleCheckSheet dto) { + + return this; + } + + @Override + protected void afterInit(CustomerSettleCheckSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public CustomerSettleCheckSheetExportModel(CustomerSettleCheckSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleCheckSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setCustomerCode(customer.getCode()); + this.setCustomerName(customer.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setTotalPayAmount(dto.getTotalPayAmount()); + this.setTotalPayedAmount(dto.getTotalPayedAmount()); + this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); + this.setTotalUnPayAmount( + NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), + dto.getTotalDiscountAmount())); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(CustomerSettleCheckSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(CustomerSettleCheckSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setCustomerCode(customer.getCode()); - this.setCustomerName(customer.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setTotalPayAmount(dto.getTotalPayAmount()); - this.setTotalPayedAmount(dto.getTotalPayedAmount()); - this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); - this.setTotalUnPayAmount( - NumberUtil.sub(dto.getTotalPayAmount(), dto.getTotalPayedAmount(), - dto.getTotalDiscountAmount())); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(CustomerSettleCheckSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportModel.java index 5866a86ade0d2255a449009b83dd6db32ab77d84..7bb940766eb7299d17cd5c3b4e9b969fba0885f4 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/SettleFeeSheetExportModel.java @@ -5,17 +5,17 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.SettleFeeSheet; import com.lframework.xingyun.settle.enums.SettleFeeSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -23,115 +23,115 @@ import lombok.Data; @Data public class SettleFeeSheetExportModel extends BaseBo implements ExcelModel { - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 供应商编号 - */ - @ExcelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ExcelProperty("供应商名称") - private String supplierName; - - /** - * 单据总金额 - */ - @ExcelProperty("单据总金额") - private BigDecimal totalAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public SettleFeeSheetExportModel() { - + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 供应商编号 + */ + @ExcelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty("供应商名称") + private String supplierName; + + /** + * 单据总金额 + */ + @ExcelProperty("单据总金额") + private BigDecimal totalAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public SettleFeeSheetExportModel() { + + } + + public SettleFeeSheetExportModel(SettleFeeSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleFeeSheet dto) { + + return this; + } + + @Override + protected void afterInit(SettleFeeSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public SettleFeeSheetExportModel(SettleFeeSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleFeeSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setSupplierCode(supplier.getCode()); + this.setSupplierName(supplier.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(SettleFeeSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(SettleFeeSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setSupplierCode(supplier.getCode()); - this.setSupplierName(supplier.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(SettleFeeSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportModel.java index d6c9106869fa610e735a31f4047be096e4623eec..9c232792a0fbf95a1eaceec242a1bf39c14e38ee 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/fee/customer/CustomerSettleFeeSheetExportModel.java @@ -5,17 +5,17 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; import com.lframework.xingyun.settle.enums.CustomerSettleFeeSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; @@ -23,117 +23,117 @@ import lombok.Data; @Data public class CustomerSettleFeeSheetExportModel extends BaseBo implements - ExcelModel { - - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 单据总金额 - */ - @ExcelProperty("单据总金额") - private BigDecimal totalAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public CustomerSettleFeeSheetExportModel() { - + ExcelModel { + + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 单据总金额 + */ + @ExcelProperty("单据总金额") + private BigDecimal totalAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public CustomerSettleFeeSheetExportModel() { + + } + + public CustomerSettleFeeSheetExportModel(CustomerSettleFeeSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleFeeSheet dto) { + + return this; + } + + @Override + protected void afterInit(CustomerSettleFeeSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public CustomerSettleFeeSheetExportModel(CustomerSettleFeeSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleFeeSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setCustomerCode(customer.getCode()); + this.setCustomerName(customer.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(CustomerSettleFeeSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(CustomerSettleFeeSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setCustomerCode(customer.getCode()); - this.setCustomerName(customer.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(CustomerSettleFeeSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportModel.java index e27cc9b62d5707fb1bb39bbb2189d570e56efcff..378f713ee1b3c555e1b1978608f455ba411cb209 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/SettlePreSheetExportModel.java @@ -5,17 +5,17 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.SettlePreSheet; import com.lframework.xingyun.settle.enums.SettlePreSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -23,115 +23,115 @@ import lombok.Data; @Data public class SettlePreSheetExportModel extends BaseBo implements ExcelModel { - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 供应商编号 - */ - @ExcelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ExcelProperty("供应商名称") - private String supplierName; - - /** - * 单据总金额 - */ - @ExcelProperty("单据总金额") - private BigDecimal totalAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public SettlePreSheetExportModel() { - + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 供应商编号 + */ + @ExcelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty("供应商名称") + private String supplierName; + + /** + * 单据总金额 + */ + @ExcelProperty("单据总金额") + private BigDecimal totalAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public SettlePreSheetExportModel() { + + } + + public SettlePreSheetExportModel(SettlePreSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettlePreSheet dto) { + + return this; + } + + @Override + protected void afterInit(SettlePreSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public SettlePreSheetExportModel(SettlePreSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettlePreSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setSupplierCode(supplier.getCode()); + this.setSupplierName(supplier.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(SettlePreSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(SettlePreSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setSupplierCode(supplier.getCode()); - this.setSupplierName(supplier.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(SettlePreSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportModel.java index ccaec83c1197fec2dde8783753271090bb7b08b7..3d8783a721973d73abb2be87b771d2c1fc622377 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/pre/customer/CustomerSettlePreSheetExportModel.java @@ -5,17 +5,17 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; import com.lframework.xingyun.settle.enums.CustomerSettlePreSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; @@ -23,117 +23,117 @@ import lombok.Data; @Data public class CustomerSettlePreSheetExportModel extends BaseBo implements - ExcelModel { - - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 单据总金额 - */ - @ExcelProperty("单据总金额") - private BigDecimal totalAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 结算状态 - */ - @ExcelProperty("结算状态") - private String settleStatus; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public CustomerSettlePreSheetExportModel() { - + ExcelModel { + + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 单据总金额 + */ + @ExcelProperty("单据总金额") + private BigDecimal totalAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 结算状态 + */ + @ExcelProperty("结算状态") + private String settleStatus; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public CustomerSettlePreSheetExportModel() { + + } + + public CustomerSettlePreSheetExportModel(CustomerSettlePreSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettlePreSheet dto) { + + return this; + } + + @Override + protected void afterInit(CustomerSettlePreSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public CustomerSettlePreSheetExportModel(CustomerSettlePreSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettlePreSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setCustomerCode(customer.getCode()); + this.setCustomerName(customer.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(CustomerSettlePreSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(CustomerSettlePreSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setCustomerCode(customer.getCode()); - this.setCustomerName(customer.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(CustomerSettlePreSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setSettleStatus(EnumUtil.getDesc(SettleStatus.class, dto.getSettleStatus())); + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportModel.java index 0ba7fa44f24a9f70f4fe8530f4760635c5c3ef34..5b45c407d8b71abe47397c4f9a06228c1c500963 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/SettleSheetExportModel.java @@ -5,16 +5,16 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Supplier; import com.lframework.xingyun.basedata.service.supplier.SupplierService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.settle.entity.SettleSheet; import com.lframework.xingyun.settle.enums.SettleSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -22,115 +22,115 @@ import lombok.Data; @Data public class SettleSheetExportModel extends BaseBo implements ExcelModel { - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 供应商编号 - */ - @ExcelProperty("供应商编号") - private String supplierCode; - - /** - * 供应商名称 - */ - @ExcelProperty("供应商名称") - private String supplierName; - - /** - * 实付总金额 - */ - @ExcelProperty("实付总金额") - private BigDecimal totalAmount; - - /** - * 优惠总金额 - */ - @ExcelProperty("优惠总金额") - private BigDecimal totalDiscountAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public SettleSheetExportModel() { - + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 供应商编号 + */ + @ExcelProperty("供应商编号") + private String supplierCode; + + /** + * 供应商名称 + */ + @ExcelProperty("供应商名称") + private String supplierName; + + /** + * 实付总金额 + */ + @ExcelProperty("实付总金额") + private BigDecimal totalAmount; + + /** + * 优惠总金额 + */ + @ExcelProperty("优惠总金额") + private BigDecimal totalDiscountAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public SettleSheetExportModel() { + + } + + public SettleSheetExportModel(SettleSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(SettleSheet dto) { + + return this; + } + + @Override + protected void afterInit(SettleSheet dto) { + + SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); + Supplier supplier = supplierService.findById(dto.getSupplierId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public SettleSheetExportModel(SettleSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(SettleSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setSupplierCode(supplier.getCode()); + this.setSupplierName(supplier.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(SettleSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(SettleSheet dto) { - - SupplierService supplierService = ApplicationUtil.getBean(SupplierService.class); - Supplier supplier = supplierService.findById(dto.getSupplierId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setSupplierCode(supplier.getCode()); - this.setSupplierName(supplier.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(SettleSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportModel.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportModel.java index b192681a2ff4ed56f981c99d94861b31fa977a4f..60eaefb713bcee8029b62c3e3eb34bf910225a7b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportModel.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/excel/sheet/customer/CustomerSettleSheetExportModel.java @@ -5,16 +5,16 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.service.UserService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.excel.ExcelModel; -import com.lframework.xingyun.template.core.dto.UserDto; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.xingyun.basedata.entity.Customer; import com.lframework.xingyun.basedata.service.customer.CustomerService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.settle.entity.CustomerSettleSheet; import com.lframework.xingyun.settle.enums.CustomerSettleSheetStatus; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; @@ -24,115 +24,115 @@ import lombok.Data; public class CustomerSettleSheetExportModel extends BaseBo implements ExcelModel { - /** - * 业务单据号 - */ - @ExcelProperty("业务单据号") - private String code; - - /** - * 客户编号 - */ - @ApiModelProperty("客户编号") - private String customerCode; - - /** - * 客户名称 - */ - @ApiModelProperty("客户名称") - private String customerName; - - /** - * 实付总金额 - */ - @ExcelProperty("实付总金额") - private BigDecimal totalAmount; - - /** - * 优惠总金额 - */ - @ExcelProperty("优惠总金额") - private BigDecimal totalDiscountAmount; - - /** - * 操作时间 - */ - @ExcelProperty("操作时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date createTime; - - /** - * 操作人 - */ - @ExcelProperty("操作人") - private String createBy; - - /** - * 审核状态 - */ - @ExcelProperty("审核状态") - private String status; - - /** - * 审核时间 - */ - @ExcelProperty("审核时间") - @DateTimeFormat(StringPool.DATE_TIME_PATTERN) - private Date approveTime; - - /** - * 审核人 - */ - @ExcelProperty("审核人") - private String approveBy; - - /** - * 备注 - */ - @ExcelProperty("备注") - private String description; - - public CustomerSettleSheetExportModel() { - + /** + * 业务单据号 + */ + @ExcelProperty("业务单据号") + private String code; + + /** + * 客户编号 + */ + @ApiModelProperty("客户编号") + private String customerCode; + + /** + * 客户名称 + */ + @ApiModelProperty("客户名称") + private String customerName; + + /** + * 实付总金额 + */ + @ExcelProperty("实付总金额") + private BigDecimal totalAmount; + + /** + * 优惠总金额 + */ + @ExcelProperty("优惠总金额") + private BigDecimal totalDiscountAmount; + + /** + * 操作时间 + */ + @ExcelProperty("操作时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date createTime; + + /** + * 操作人 + */ + @ExcelProperty("操作人") + private String createBy; + + /** + * 审核状态 + */ + @ExcelProperty("审核状态") + private String status; + + /** + * 审核时间 + */ + @ExcelProperty("审核时间") + @DateTimeFormat(StringPool.DATE_TIME_PATTERN) + private Date approveTime; + + /** + * 审核人 + */ + @ExcelProperty("审核人") + private String approveBy; + + /** + * 备注 + */ + @ExcelProperty("备注") + private String description; + + public CustomerSettleSheetExportModel() { + + } + + public CustomerSettleSheetExportModel(CustomerSettleSheet dto) { + + super(dto); + } + + @Override + public BaseBo convert(CustomerSettleSheet dto) { + + return this; + } + + @Override + protected void afterInit(CustomerSettleSheet dto) { + + CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); + Customer customer = customerService.findById(dto.getCustomerId()); + + SysUserService userService = ApplicationUtil.getBean(SysUserService.class); + SysUser approveBy = null; + if (!StringUtil.isBlank(dto.getApproveBy())) { + approveBy = userService.findById(dto.getApproveBy()); } - public CustomerSettleSheetExportModel(CustomerSettleSheet dto) { - - super(dto); - } - - @Override - public BaseBo convert(CustomerSettleSheet dto) { - - return this; + this.setCode(dto.getCode()); + this.setCustomerCode(customer.getCode()); + this.setCustomerName(customer.getName()); + this.setTotalAmount(dto.getTotalAmount()); + this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); + this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); + this.setStatus(EnumUtil.getDesc(CustomerSettleSheetStatus.class, dto.getStatus())); + if (approveBy != null) { + this.setApproveBy(approveBy.getName()); } - @Override - protected void afterInit(CustomerSettleSheet dto) { - - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); - Customer customer = customerService.findById(dto.getCustomerId()); - - UserService userService = ApplicationUtil.getBean(UserService.class); - UserDto approveBy = null; - if (!StringUtil.isBlank(dto.getApproveBy())) { - approveBy = userService.findById(dto.getApproveBy()); - } - - this.setCode(dto.getCode()); - this.setCustomerCode(customer.getCode()); - this.setCustomerName(customer.getName()); - this.setTotalAmount(dto.getTotalAmount()); - this.setTotalDiscountAmount(dto.getTotalDiscountAmount()); - this.setCreateTime(DateUtil.toDate(dto.getCreateTime())); - this.setStatus(EnumUtil.getDesc(CustomerSettleSheetStatus.class, dto.getStatus())); - if (approveBy != null) { - this.setApproveBy(approveBy.getName()); - } - - if (dto.getApproveTime() != null) { - this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); - } - this.setDescription(dto.getDescription()); + if (dto.getApproveTime() != null) { + this.setApproveTime(DateUtil.toDate(dto.getApproveTime())); } + this.setDescription(dto.getDescription()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetServiceImpl.java index 9ddaaa816dc6ab04ec07ffc06a4bb79beff61105..985e918af2dcbea7f8c296738887d26e3f2b3013 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleCheckSheetServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.DefaultSysException; import com.lframework.starter.common.exceptions.impl.InputErrorException; @@ -12,16 +11,16 @@ import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; +import com.lframework.xingyun.core.service.GenerateCodeService; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; import com.lframework.xingyun.sc.entity.SaleOutSheet; import com.lframework.xingyun.sc.entity.SaleReturn; @@ -47,15 +46,13 @@ import com.lframework.xingyun.settle.service.CustomerSettleFeeSheetService; import com.lframework.xingyun.settle.service.CustomerSettlePreSheetService; import com.lframework.xingyun.settle.vo.check.customer.ApprovePassCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.ApproveRefuseCustomerSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.customer.BatchApprovePassCustomerSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.customer.BatchApproveRefuseCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.CreateCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.CustomerSettleCheckSheetItemVo; import com.lframework.xingyun.settle.vo.check.customer.QueryCustomerSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.customer.QueryCustomerUnCheckBizItemVo; import com.lframework.xingyun.settle.vo.check.customer.UpdateCustomerSettleCheckSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -297,46 +294,6 @@ public class CustomerSettleCheckSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassCustomerSettleCheckSheetVo vo) { - - CustomerSettleCheckSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassCustomerSettleCheckSheetVo approveVo = new ApprovePassCustomerSettleCheckSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户对账单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseCustomerSettleCheckSheetVo vo) { - - CustomerSettleCheckSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseCustomerSettleCheckSheetVo approveVo = new ApproveRefuseCustomerSettleCheckSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户对账单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户对账单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @@ -382,28 +339,6 @@ public class CustomerSettleCheckSheetServiceImpl extends OpLogUtil.setVariable("code", sheet.getCode()); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - CustomerSettleCheckSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException( - "第" + orderNo + "个客户对账单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } - } - @Override public CustomerSettleCheckBizItemDto getBizItem(String id, CustomerSettleCheckSheetBizType bizType) { diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetServiceImpl.java index 91ef597f460acc89f3f3df92814b4dddceed5a09..edf8ff2d0082d55b42d0207c4c6dc9ccda4c0e9e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleFeeSheetServiceImpl.java @@ -4,23 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; +import com.lframework.xingyun.core.service.GenerateCodeService; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; @@ -39,14 +37,12 @@ import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.service.SettleOutItemService; import com.lframework.xingyun.settle.vo.fee.customer.ApprovePassCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.ApproveRefuseCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApprovePassCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApproveRefuseCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.CreateCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.CustomerSettleFeeSheetItemVo; import com.lframework.xingyun.settle.vo.fee.customer.QueryCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.UpdateCustomerSettleFeeSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -270,48 +266,6 @@ public class CustomerSettleFeeSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassCustomerSettleFeeSheetVo vo) { - - CustomerSettleFeeSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassCustomerSettleFeeSheetVo approveVo = new ApprovePassCustomerSettleFeeSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException( - "第" + orderNo + "个客户费用单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseCustomerSettleFeeSheetVo vo) { - - CustomerSettleFeeSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseCustomerSettleFeeSheetVo approveVo = new ApproveRefuseCustomerSettleFeeSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException( - "第" + orderNo + "个客户费用单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户费用单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @@ -346,28 +300,6 @@ public class CustomerSettleFeeSheetServiceImpl extends OpLogUtil.setVariable("code", sheet.getCode()); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - CustomerSettleFeeSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException( - "第" + orderNo + "个客户费用单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } - } - @Transactional(rollbackFor = Exception.class) @Override public int setUnSettle(String id) { diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetServiceImpl.java index 9bec66d776ad914a62df0f11b3e3cca725011863..befef25161c9efa084bc5afafbb1607596a1ad9e 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettlePreSheetServiceImpl.java @@ -4,22 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; +import com.lframework.xingyun.core.service.GenerateCodeService; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; @@ -35,14 +33,12 @@ import com.lframework.xingyun.settle.service.CustomerSettlePreSheetService; import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.vo.pre.customer.ApprovePassCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.ApproveRefuseCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApprovePassCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApproveRefuseCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.CreateCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.CustomerSettlePreSheetItemVo; import com.lframework.xingyun.settle.vo.pre.customer.QueryCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.UpdateCustomerSettlePreSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -263,46 +259,6 @@ public class CustomerSettlePreSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassCustomerSettlePreSheetVo vo) { - - CustomerSettlePreSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassCustomerSettlePreSheetVo approveVo = new ApprovePassCustomerSettlePreSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户预付款单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseCustomerSettlePreSheetVo vo) { - - CustomerSettlePreSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseCustomerSettlePreSheetVo approveVo = new ApproveRefuseCustomerSettlePreSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户预付款单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户预付款单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @@ -337,27 +293,6 @@ public class CustomerSettlePreSheetServiceImpl extends OpLogUtil.setVariable("code", sheet.getCode()); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - CustomerSettlePreSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户预付款单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } - } - @Transactional(rollbackFor = Exception.class) @Override public int setUnSettle(String id) { diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetServiceImpl.java index ef25b82350a775284d0bfc2cc483ca7127f199bf..0c211ed6bffd298c0a99061fe7361a2eb2dc0472 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/CustomerSettleSheetServiceImpl.java @@ -4,22 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; +import com.lframework.xingyun.core.service.GenerateCodeService; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleBizItemDto; @@ -35,15 +34,13 @@ import com.lframework.xingyun.settle.service.CustomerSettleSheetDetailService; import com.lframework.xingyun.settle.service.CustomerSettleSheetService; import com.lframework.xingyun.settle.vo.sheet.customer.ApprovePassCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.ApproveRefuseCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApprovePassCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApproveRefuseCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.CreateCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.CustomerSettleSheetItemVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerUnSettleBizItemVo; import com.lframework.xingyun.settle.vo.sheet.customer.UpdateCustomerSettleSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -282,46 +279,6 @@ public class CustomerSettleSheetServiceImpl extends OpLogUtil.setExtra(vo); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassCustomerSettleSheetVo vo) { - - CustomerSettleSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassCustomerSettleSheetVo approveVo = new ApprovePassCustomerSettleSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户结算单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseCustomerSettleSheetVo vo) { - - CustomerSettleSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseCustomerSettleSheetVo approveVo = new ApproveRefuseCustomerSettleSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户结算单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除客户结算单，单号：{}", params = "#code") @OrderTimeLineLog(orderId = "#id", delete = true) @Transactional(rollbackFor = Exception.class) @@ -367,27 +324,6 @@ public class CustomerSettleSheetServiceImpl extends OpLogUtil.setVariable("code", sheet.getCode()); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - CustomerSettleSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个客户结算单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } - } - @Override public CustomerSettleBizItemDto getBizItem(String id) { diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetServiceImpl.java index 96d593e29e3c0ffc2509dae0f377bf037a0aca27..792971290c0775f62c3dff2c6ab1007af1c40963 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleCheckSheetServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.DefaultSysException; import com.lframework.starter.common.exceptions.impl.InputErrorException; @@ -12,17 +11,19 @@ import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.sc.entity.PurchaseReturn; import com.lframework.xingyun.sc.entity.ReceiveSheet; import com.lframework.xingyun.sc.enums.SettleStatus; @@ -47,15 +48,11 @@ import com.lframework.xingyun.settle.service.SettleFeeSheetService; import com.lframework.xingyun.settle.service.SettlePreSheetService; import com.lframework.xingyun.settle.vo.check.ApprovePassSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.ApproveRefuseSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.BatchApprovePassSettleCheckSheetVo; -import com.lframework.xingyun.settle.vo.check.BatchApproveRefuseSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.CreateSettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.QuerySettleCheckSheetVo; import com.lframework.xingyun.settle.vo.check.QueryUnCheckBizItemVo; import com.lframework.xingyun.settle.vo.check.SettleCheckSheetItemVo; import com.lframework.xingyun.settle.vo.check.UpdateSettleCheckSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -65,735 +62,719 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -public class SettleCheckSheetServiceImpl extends BaseMpServiceImpl - implements SettleCheckSheetService { +public class SettleCheckSheetServiceImpl extends + BaseMpServiceImpl + implements SettleCheckSheetService { - @Autowired - private SettleCheckSheetDetailService settleCheckSheetDetailService; + @Autowired + private SettleCheckSheetDetailService settleCheckSheetDetailService; - @Autowired - private GenerateCodeService generateCodeService; + @Autowired + private GenerateCodeService generateCodeService; - @Autowired - private ReceiveSheetService receiveSheetService; + @Autowired + private ReceiveSheetService receiveSheetService; - @Autowired - private PurchaseReturnService purchaseReturnService; + @Autowired + private PurchaseReturnService purchaseReturnService; - @Autowired - private SettleFeeSheetService settleFeeSheetService; + @Autowired + private SettleFeeSheetService settleFeeSheetService; - @Autowired - private SettlePreSheetService settlePreSheetService; + @Autowired + private SettlePreSheetService settlePreSheetService; - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySettleCheckSheetVo vo) { + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySettleCheckSheetVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public List query(QuerySettleCheckSheetVo vo) { - - return getBaseMapper().query(vo); - } + return PageResultUtil.convert(new PageInfo<>(datas)); + } - @Override - public SettleCheckSheetFullDto getDetail(String id) { + @Override + public List query(QuerySettleCheckSheetVo vo) { - return getBaseMapper().getDetail(id); - } + return getBaseMapper().query(vo); + } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建对账单") - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSettleCheckSheetVo vo) { + @Override + public SettleCheckSheetFullDto getDetail(String id) { - SettleCheckSheet sheet = new SettleCheckSheet(); + return getBaseMapper().getDetail(id); + } - sheet.setId(IdUtil.getId()); - sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_CHECK_SHEET)); + @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建对账单") + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateSettleCheckSheetVo vo) { - this.create(sheet, vo); + SettleCheckSheet sheet = new SettleCheckSheet(); - sheet.setStatus(SettleCheckSheetStatus.CREATED); + sheet.setId(IdUtil.getId()); + sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_CHECK_SHEET)); - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + this.create(sheet, vo); - getBaseMapper().insert(sheet); + sheet.setStatus(SettleCheckSheetStatus.CREATED); - return sheet.getId(); - } + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); - @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改对账单") - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSettleCheckSheetVo vo) { + getBaseMapper().insert(sheet); - SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商对账单不存在！"); - } - - if (sheet.getStatus() != SettleCheckSheetStatus.CREATED - && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商对账单已审核通过，无法修改！"); - } else { - throw new DefaultClientException("供应商对账单无法修改！"); - } - } - - //将所有的单据的结算状态更新 - Wrapper queryDetailWrapper = Wrappers.lambdaQuery(SettleCheckSheetDetail.class) - .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()).orderByAsc(SettleCheckSheetDetail::getOrderNo); - List sheetDetails = settleCheckSheetDetailService.list(queryDetailWrapper); - for (SettleCheckSheetDetail sheetDetail : sheetDetails) { - this.setBizItemUnSettle(sheetDetail.getBizId(), sheetDetail.getBizType()); - } + return sheet.getId(); + } - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettleCheckSheetDetail.class) - .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()); - settleCheckSheetDetailService.remove(deleteDetailWrapper); + @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改对账单") + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSettleCheckSheetVo vo) { - this.create(sheet, vo); - - sheet.setStatus(SettleCheckSheetStatus.CREATED); - - List statusList = new ArrayList<>(); - statusList.add(SettleCheckSheetStatus.CREATED); - statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .set(SettleCheckSheet::getApproveBy, null).set(SettleCheckSheet::getApproveTime, null) - .set(SettleCheckSheet::getRefuseReason, StringPool.EMPTY_STR).eq(SettleCheckSheet::getId, sheet.getId()) - .in(SettleCheckSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商对账单不存在！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void approvePass(ApprovePassSettleCheckSheetVo vo) { - - SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商对账单不存在！"); - } - - if (sheet.getStatus() != SettleCheckSheetStatus.CREATED - && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商对账单已审核通过，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商对账单无法审核通过！"); - } - - sheet.setStatus(SettleCheckSheetStatus.APPROVE_PASS); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - if (!StringUtil.isBlank(vo.getDescription())) { - sheet.setDescription(vo.getDescription()); - } - - List statusList = new ArrayList<>(); - statusList.add(SettleCheckSheetStatus.CREATED); - statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .eq(SettleCheckSheet::getId, sheet.getId()).in(SettleCheckSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + if (sheet.getStatus() != SettleCheckSheetStatus.CREATED + && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商对账单已审核通过，无法修改！"); + } else { + throw new DefaultClientException("供应商对账单无法修改！"); + } } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public String directApprovePass(CreateSettleCheckSheetVo vo) { + //将所有的单据的结算状态更新 + Wrapper queryDetailWrapper = Wrappers.lambdaQuery( + SettleCheckSheetDetail.class) + .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()) + .orderByAsc(SettleCheckSheetDetail::getOrderNo); + List sheetDetails = settleCheckSheetDetailService.list( + queryDetailWrapper); + for (SettleCheckSheetDetail sheetDetail : sheetDetails) { + this.setBizItemUnSettle(sheetDetail.getBizId(), sheetDetail.getBizType()); + } - SettleCheckSheetService thisService = getThis(this.getClass()); + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettleCheckSheetDetail.class) + .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()); + settleCheckSheetDetailService.remove(deleteDetailWrapper); - String id = thisService.create(vo); + this.create(sheet, vo); - ApprovePassSettleCheckSheetVo approveVo = new ApprovePassSettleCheckSheetVo(); - approveVo.setId(id); + sheet.setStatus(SettleCheckSheetStatus.CREATED); - thisService.approvePass(approveVo); + List statusList = new ArrayList<>(); + statusList.add(SettleCheckSheetStatus.CREATED); + statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); - return id; + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .set(SettleCheckSheet::getApproveBy, null).set(SettleCheckSheet::getApproveTime, null) + .set(SettleCheckSheet::getRefuseReason, StringPool.EMPTY_STR) + .eq(SettleCheckSheet::getId, sheet.getId()) + .in(SettleCheckSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void approveRefuse(ApproveRefuseSettleCheckSheetVo vo) { - - SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商对账单不存在！"); - } - - if (sheet.getStatus() != SettleCheckSheetStatus.CREATED) { - if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商对账单已审核通过，不允许继续执行审核！"); - } - if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_REFUSE) { - throw new DefaultClientException("供应商对账单已审核拒绝，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商对账单无法审核拒绝！"); - } - - sheet.setStatus(SettleCheckSheetStatus.APPROVE_REFUSE); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - sheet.setRefuseReason(vo.getRefuseReason()); + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - List statusList = new ArrayList<>(); - statusList.add(SettleCheckSheetStatus.CREATED); - statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); + @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public void approvePass(ApprovePassSettleCheckSheetVo vo) { - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .eq(SettleCheckSheet::getId, sheet.getId()).in(SettleCheckSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); - } + SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商对账单不存在！"); + } - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + if (sheet.getStatus() != SettleCheckSheetStatus.CREATED + && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商对账单已审核通过，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商对账单无法审核通过！"); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassSettleCheckSheetVo vo) { - - SettleCheckSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassSettleCheckSheetVo approveVo = new ApprovePassSettleCheckSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商对账单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } + sheet.setStatus(SettleCheckSheetStatus.APPROVE_PASS); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + if (!StringUtil.isBlank(vo.getDescription())) { + sheet.setDescription(vo.getDescription()); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseSettleCheckSheetVo vo) { - - SettleCheckSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseSettleCheckSheetVo approveVo = new ApproveRefuseSettleCheckSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商对账单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } + List statusList = new ArrayList<>(); + statusList.add(SettleCheckSheetStatus.CREATED); + statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .eq(SettleCheckSheet::getId, sheet.getId()).in(SettleCheckSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商对账单，单号：{}", params = "#code") - @OrderTimeLineLog(orderId = "#id", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - Assert.notBlank(id); - SettleCheckSheet sheet = getBaseMapper().selectById(id); - if (sheet == null) { - throw new InputErrorException("供应商对账单不存在！"); - } + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public String directApprovePass(CreateSettleCheckSheetVo vo) { - if (sheet.getStatus() != SettleCheckSheetStatus.CREATED - && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { + SettleCheckSheetService thisService = getThis(this.getClass()); - if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("“审核通过”的供应商对账单不允许执行删除操作！"); - } + String id = thisService.create(vo); - throw new DefaultClientException("供应商对账单无法删除！"); - } + ApprovePassSettleCheckSheetVo approveVo = new ApprovePassSettleCheckSheetVo(); + approveVo.setId(id); - //将所有的单据的结算状态更新 - Wrapper queryDetailWrapper = Wrappers.lambdaQuery(SettleCheckSheetDetail.class) - .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()).orderByAsc(SettleCheckSheetDetail::getOrderNo); - List sheetDetails = settleCheckSheetDetailService.list(queryDetailWrapper); - for (SettleCheckSheetDetail sheetDetail : sheetDetails) { - this.setBizItemUnSettle(sheetDetail.getBizId(), sheetDetail.getBizType()); - } + thisService.approvePass(approveVo); - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettleCheckSheetDetail.class) - .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()); - settleCheckSheetDetailService.remove(deleteDetailWrapper); + return id; + } - // 删除单据 - getBaseMapper().deleteById(id); + @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @Transactional(rollbackFor = Exception.class) + @Override + public void approveRefuse(ApproveRefuseSettleCheckSheetVo vo) { - OpLogUtil.setVariable("code", sheet.getCode()); + SettleCheckSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商对账单不存在！"); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { + if (sheet.getStatus() != SettleCheckSheetStatus.CREATED) { + if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商对账单已审核通过，不允许继续执行审核！"); + } + if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_REFUSE) { + throw new DefaultClientException("供应商对账单已审核拒绝，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商对账单无法审核拒绝！"); + } - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { + sheet.setStatus(SettleCheckSheetStatus.APPROVE_REFUSE); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + sheet.setRefuseReason(vo.getRefuseReason()); - try { - SettleCheckSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商对账单删除失败，失败原因：" + e.getMsg()); - } + List statusList = new ArrayList<>(); + statusList.add(SettleCheckSheetStatus.CREATED); + statusList.add(SettleCheckSheetStatus.APPROVE_REFUSE); - orderNo++; - } - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .eq(SettleCheckSheet::getId, sheet.getId()).in(SettleCheckSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); } - @Override - public SettleCheckBizItemDto getBizItem(String id, SettleCheckSheetBizType bizType) { + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商对账单，单号：{}", params = "#code") + @OrderTimeLineLog(orderId = "#id", delete = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(String id) { - switch (bizType) { - case RECEIVE_SHEET: { - ReceiveSheet receiveSheet = receiveSheetService.getById(id); - - result.setId(receiveSheet.getId()); - result.setCode(receiveSheet.getCode()); - result.setTotalAmount(receiveSheet.getTotalAmount()); - result.setApproveTime(receiveSheet.getApproveTime()); - result.setCalcType(SettleCheckSheetCalcType.ADD); - break; - } - case PURCHASE_RETURN: { - PurchaseReturn purchaseReturn = purchaseReturnService.getById(id); - - result.setId(purchaseReturn.getId()); - result.setCode(purchaseReturn.getCode()); - result.setTotalAmount(purchaseReturn.getTotalAmount()); - result.setApproveTime(purchaseReturn.getApproveTime()); - result.setCalcType(SettleCheckSheetCalcType.SUB); - break; - } - case SETTLE_FEE_SHEET: { - SettleFeeSheet feeSheet = settleFeeSheetService.getById(id); - - result.setId(feeSheet.getId()); - result.setCode(feeSheet.getCode()); - result.setTotalAmount(feeSheet.getTotalAmount()); - result.setApproveTime(feeSheet.getApproveTime()); - result.setCalcType(feeSheet.getSheetType() == SettleFeeSheetType.PAY ? - SettleCheckSheetCalcType.ADD : - SettleCheckSheetCalcType.SUB); - break; - } - case SETTLE_PRE_SHEET: { - SettlePreSheet preSheet = settlePreSheetService.getById(id); - - result.setId(preSheet.getId()); - result.setCode(preSheet.getCode()); - result.setTotalAmount(preSheet.getTotalAmount()); - result.setApproveTime(preSheet.getApproveTime()); - result.setCalcType(SettleCheckSheetCalcType.SUB); - break; - } - default: { - throw new DefaultSysException("未知的SettleCheckSheetBizType"); - } - } + Assert.notBlank(id); + SettleCheckSheet sheet = getBaseMapper().selectById(id); + if (sheet == null) { + throw new InputErrorException("供应商对账单不存在！"); + } - result.setBizType(bizType); - if (result.getCalcType() == SettleCheckSheetCalcType.SUB) { - result.setTotalAmount(result.getTotalAmount().negate()); - } + if (sheet.getStatus() != SettleCheckSheetStatus.CREATED + && sheet.getStatus() != SettleCheckSheetStatus.APPROVE_REFUSE) { - return result; - } + if (sheet.getStatus() == SettleCheckSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("“审核通过”的供应商对账单不允许执行删除操作！"); + } - @Transactional(rollbackFor = Exception.class) - @Override - public void setBizItemUnSettle(String id, SettleCheckSheetBizType bizType) { - - SettleCheckBizItemDto item = this.getBizItem(id, bizType); - - switch (bizType) { - case RECEIVE_SHEET: { - int count = receiveSheetService.setUnSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case PURCHASE_RETURN: { - int count = purchaseReturnService.setUnSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case SETTLE_FEE_SHEET: { - int count = settleFeeSheetService.setUnSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case SETTLE_PRE_SHEET: { - int count = settlePreSheetService.setUnSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - default: { - throw new DefaultSysException("未知的SettleCheckSheetBizType"); - } - } + throw new DefaultClientException("供应商对账单无法删除！"); } - @Transactional(rollbackFor = Exception.class) - @Override - public void setBizItemPartSettle(String id, SettleCheckSheetBizType bizType) { - - SettleCheckBizItemDto item = this.getBizItem(id, bizType); - - switch (bizType) { - case RECEIVE_SHEET: { - int count = receiveSheetService.setPartSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case PURCHASE_RETURN: { - int count = purchaseReturnService.setPartSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case SETTLE_FEE_SHEET: { - int count = settleFeeSheetService.setPartSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - case SETTLE_PRE_SHEET: { - int count = settlePreSheetService.setPartSettle(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); - } - break; - } - default: { - throw new DefaultSysException("未知的SettleCheckSheetBizType"); - } - } + //将所有的单据的结算状态更新 + Wrapper queryDetailWrapper = Wrappers.lambdaQuery( + SettleCheckSheetDetail.class) + .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()) + .orderByAsc(SettleCheckSheetDetail::getOrderNo); + List sheetDetails = settleCheckSheetDetailService.list( + queryDetailWrapper); + for (SettleCheckSheetDetail sheetDetail : sheetDetails) { + this.setBizItemUnSettle(sheetDetail.getBizId(), sheetDetail.getBizType()); } - @Transactional(rollbackFor = Exception.class) - @Override - public void setBizItemSettled(String id, SettleCheckSheetBizType bizType) { - - SettleCheckBizItemDto item = this.getBizItem(id, bizType); - - switch (bizType) { - case RECEIVE_SHEET: { - int count = receiveSheetService.setSettled(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); - } - break; - } - case PURCHASE_RETURN: { - int count = purchaseReturnService.setSettled(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); - } - break; - } - case SETTLE_FEE_SHEET: { - int count = settleFeeSheetService.setSettled(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); - } - break; - } - case SETTLE_PRE_SHEET: { - int count = settlePreSheetService.setSettled(id); - if (count != 1) { - throw new DefaultClientException("单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); - } - break; - } - default: { - throw new DefaultSysException("未知的SettleCheckSheetBizType"); - } - } + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettleCheckSheetDetail.class) + .eq(SettleCheckSheetDetail::getSheetId, sheet.getId()); + settleCheckSheetDetailService.remove(deleteDetailWrapper); + + // 删除单据 + Wrapper deleteWrapper = Wrappers.lambdaQuery(SettleCheckSheet.class) + .eq(SettleCheckSheet::getId, id) + .in(SettleCheckSheet::getStatus, SettleCheckSheetStatus.CREATED, + SettleCheckSheetStatus.APPROVE_REFUSE); + if (!remove(deleteWrapper)) { + throw new DefaultClientException("供应商对账单信息已过期，请刷新重试！"); } - @Override - public List getUnCheckBizItems(QueryUnCheckBizItemVo vo) { - - List results = new ArrayList<>(); - - List receiveSheetList = receiveSheetService.getApprovedList(vo.getSupplierId(), vo.getStartTime(), - vo.getEndTime(), SettleStatus.UN_SETTLE); - - List purchaseReturnList = purchaseReturnService.getApprovedList(vo.getSupplierId(), - vo.getStartTime(), vo.getEndTime(), SettleStatus.UN_SETTLE); + OpLogUtil.setVariable("code", sheet.getCode()); + } + + @Override + public SettleCheckBizItemDto getBizItem(String id, SettleCheckSheetBizType bizType) { + + SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + + switch (bizType) { + case RECEIVE_SHEET: { + ReceiveSheet receiveSheet = receiveSheetService.getById(id); + + result.setId(receiveSheet.getId()); + result.setCode(receiveSheet.getCode()); + result.setTotalAmount(receiveSheet.getTotalAmount()); + result.setApproveTime(receiveSheet.getApproveTime()); + result.setCalcType(SettleCheckSheetCalcType.ADD); + break; + } + case PURCHASE_RETURN: { + PurchaseReturn purchaseReturn = purchaseReturnService.getById(id); + + result.setId(purchaseReturn.getId()); + result.setCode(purchaseReturn.getCode()); + result.setTotalAmount(purchaseReturn.getTotalAmount()); + result.setApproveTime(purchaseReturn.getApproveTime()); + result.setCalcType(SettleCheckSheetCalcType.SUB); + break; + } + case SETTLE_FEE_SHEET: { + SettleFeeSheet feeSheet = settleFeeSheetService.getById(id); + + result.setId(feeSheet.getId()); + result.setCode(feeSheet.getCode()); + result.setTotalAmount(feeSheet.getTotalAmount()); + result.setApproveTime(feeSheet.getApproveTime()); + result.setCalcType(feeSheet.getSheetType() == SettleFeeSheetType.PAY ? + SettleCheckSheetCalcType.ADD : + SettleCheckSheetCalcType.SUB); + break; + } + case SETTLE_PRE_SHEET: { + SettlePreSheet preSheet = settlePreSheetService.getById(id); + + result.setId(preSheet.getId()); + result.setCode(preSheet.getCode()); + result.setTotalAmount(preSheet.getTotalAmount()); + result.setApproveTime(preSheet.getApproveTime()); + result.setCalcType(SettleCheckSheetCalcType.SUB); + break; + } + default: { + throw new DefaultSysException("未知的SettleCheckSheetBizType"); + } + } - List feeSheetList = settleFeeSheetService.getApprovedList(vo.getSupplierId(), vo.getStartTime(), - vo.getEndTime(), SettleStatus.UN_SETTLE); + result.setBizType(bizType); + if (result.getCalcType() == SettleCheckSheetCalcType.SUB) { + result.setTotalAmount(result.getTotalAmount().negate()); + } - List preSheetList = settlePreSheetService.getApprovedList(vo.getSupplierId(), vo.getStartTime(), - vo.getEndTime(), SettleStatus.UN_SETTLE); + return result; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void setBizItemUnSettle(String id, SettleCheckSheetBizType bizType) { + + SettleCheckBizItemDto item = this.getBizItem(id, bizType); + + switch (bizType) { + case RECEIVE_SHEET: { + int count = receiveSheetService.setUnSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case PURCHASE_RETURN: { + int count = purchaseReturnService.setUnSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case SETTLE_FEE_SHEET: { + int count = settleFeeSheetService.setUnSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case SETTLE_PRE_SHEET: { + int count = settlePreSheetService.setUnSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + default: { + throw new DefaultSysException("未知的SettleCheckSheetBizType"); + } + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void setBizItemPartSettle(String id, SettleCheckSheetBizType bizType) { + + SettleCheckBizItemDto item = this.getBizItem(id, bizType); + + switch (bizType) { + case RECEIVE_SHEET: { + int count = receiveSheetService.setPartSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case PURCHASE_RETURN: { + int count = purchaseReturnService.setPartSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case SETTLE_FEE_SHEET: { + int count = settleFeeSheetService.setPartSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + case SETTLE_PRE_SHEET: { + int count = settlePreSheetService.setPartSettle(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，业务无法进行！"); + } + break; + } + default: { + throw new DefaultSysException("未知的SettleCheckSheetBizType"); + } + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void setBizItemSettled(String id, SettleCheckSheetBizType bizType) { + + SettleCheckBizItemDto item = this.getBizItem(id, bizType); + + switch (bizType) { + case RECEIVE_SHEET: { + int count = receiveSheetService.setSettled(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); + } + break; + } + case PURCHASE_RETURN: { + int count = purchaseReturnService.setSettled(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); + } + break; + } + case SETTLE_FEE_SHEET: { + int count = settleFeeSheetService.setSettled(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); + } + break; + } + case SETTLE_PRE_SHEET: { + int count = settlePreSheetService.setSettled(id); + if (count != 1) { + throw new DefaultClientException( + "单号：" + item.getCode() + "，" + bizType.getDesc() + "已结算，无法重复结算！"); + } + break; + } + default: { + throw new DefaultSysException("未知的SettleCheckSheetBizType"); + } + } + } - if (!CollectionUtil.isEmpty(receiveSheetList)) { - for (ReceiveSheet item : receiveSheetList) { - SettleCheckBizItemDto result = new SettleCheckBizItemDto(); - result.setId(item.getId()); - result.setCode(item.getCode()); - result.setTotalAmount(item.getTotalAmount()); - result.setApproveTime(item.getApproveTime()); - result.setBizType(SettleCheckSheetBizType.RECEIVE_SHEET); - result.setCalcType(SettleCheckSheetCalcType.ADD); + @Override + public List getUnCheckBizItems(QueryUnCheckBizItemVo vo) { - results.add(result); - } - } + List results = new ArrayList<>(); - if (!CollectionUtil.isEmpty(purchaseReturnList)) { - for (PurchaseReturn item : purchaseReturnList) { - SettleCheckBizItemDto result = new SettleCheckBizItemDto(); - result.setId(item.getId()); - result.setCode(item.getCode()); - result.setTotalAmount(item.getTotalAmount()); - result.setApproveTime(item.getApproveTime()); - result.setBizType(SettleCheckSheetBizType.PURCHASE_RETURN); - result.setCalcType(SettleCheckSheetCalcType.SUB); - - results.add(result); - } - } + List receiveSheetList = receiveSheetService.getApprovedList(vo.getSupplierId(), + vo.getStartTime(), + vo.getEndTime(), SettleStatus.UN_SETTLE); - if (!CollectionUtil.isEmpty(feeSheetList)) { - for (SettleFeeSheet item : feeSheetList) { - SettleCheckBizItemDto result = new SettleCheckBizItemDto(); - result.setId(item.getId()); - result.setCode(item.getCode()); - result.setTotalAmount(item.getTotalAmount()); - result.setApproveTime(item.getApproveTime()); - result.setBizType(SettleCheckSheetBizType.SETTLE_FEE_SHEET); - result.setCalcType(item.getSheetType() == SettleFeeSheetType.PAY ? - SettleCheckSheetCalcType.ADD : - SettleCheckSheetCalcType.SUB); - - results.add(result); - } - } + List purchaseReturnList = purchaseReturnService.getApprovedList( + vo.getSupplierId(), + vo.getStartTime(), vo.getEndTime(), SettleStatus.UN_SETTLE); - if (!CollectionUtil.isEmpty(preSheetList)) { - for (SettlePreSheet item : preSheetList) { - SettleCheckBizItemDto result = new SettleCheckBizItemDto(); - result.setId(item.getId()); - result.setCode(item.getCode()); - result.setTotalAmount(item.getTotalAmount()); - result.setApproveTime(item.getApproveTime()); - result.setBizType(SettleCheckSheetBizType.SETTLE_PRE_SHEET); - result.setCalcType(SettleCheckSheetCalcType.SUB); - - results.add(result); - } - } + List feeSheetList = settleFeeSheetService.getApprovedList(vo.getSupplierId(), + vo.getStartTime(), + vo.getEndTime(), SettleStatus.UN_SETTLE); - results.stream().filter(t -> t.getCalcType() == SettleCheckSheetCalcType.SUB) - .forEach(t -> t.setTotalAmount(t.getTotalAmount().negate())); + List preSheetList = settlePreSheetService.getApprovedList(vo.getSupplierId(), + vo.getStartTime(), + vo.getEndTime(), SettleStatus.UN_SETTLE); - return results; + if (!CollectionUtil.isEmpty(receiveSheetList)) { + for (ReceiveSheet item : receiveSheetList) { + SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + result.setId(item.getId()); + result.setCode(item.getCode()); + result.setTotalAmount(item.getTotalAmount()); + result.setApproveTime(item.getApproveTime()); + result.setBizType(SettleCheckSheetBizType.RECEIVE_SHEET); + result.setCalcType(SettleCheckSheetCalcType.ADD); + + results.add(result); + } } - @Transactional(rollbackFor = Exception.class) - @Override - public int setUnSettle(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .set(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE).eq(SettleCheckSheet::getId, id) - .eq(SettleCheckSheet::getSettleStatus, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); - - return count; + if (!CollectionUtil.isEmpty(purchaseReturnList)) { + for (PurchaseReturn item : purchaseReturnList) { + SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + result.setId(item.getId()); + result.setCode(item.getCode()); + result.setTotalAmount(item.getTotalAmount()); + result.setApproveTime(item.getApproveTime()); + result.setBizType(SettleCheckSheetBizType.PURCHASE_RETURN); + result.setCalcType(SettleCheckSheetCalcType.SUB); + + results.add(result); + } } - @Transactional(rollbackFor = Exception.class) - @Override - public int setPartSettle(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .set(SettleCheckSheet::getSettleStatus, SettleStatus.PART_SETTLE).eq(SettleCheckSheet::getId, id) - .in(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); - - return count; + if (!CollectionUtil.isEmpty(feeSheetList)) { + for (SettleFeeSheet item : feeSheetList) { + SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + result.setId(item.getId()); + result.setCode(item.getCode()); + result.setTotalAmount(item.getTotalAmount()); + result.setApproveTime(item.getApproveTime()); + result.setBizType(SettleCheckSheetBizType.SETTLE_FEE_SHEET); + result.setCalcType(item.getSheetType() == SettleFeeSheetType.PAY ? + SettleCheckSheetCalcType.ADD : + SettleCheckSheetCalcType.SUB); + + results.add(result); + } } - @Transactional(rollbackFor = Exception.class) - @Override - public int setSettled(String id) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .set(SettleCheckSheet::getSettleStatus, SettleStatus.SETTLED).eq(SettleCheckSheet::getId, id) - .in(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); - - //将所有的单据的结算状态更新 - Wrapper queryDetailWrapper = Wrappers.lambdaQuery(SettleCheckSheetDetail.class) - .eq(SettleCheckSheetDetail::getSheetId, id).orderByAsc(SettleCheckSheetDetail::getOrderNo); - List sheetDetails = settleCheckSheetDetailService.list(queryDetailWrapper); - for (SettleCheckSheetDetail sheetDetail : sheetDetails) { - this.setBizItemSettled(sheetDetail.getBizId(), sheetDetail.getBizType()); - } - - return count; + if (!CollectionUtil.isEmpty(preSheetList)) { + for (SettlePreSheet item : preSheetList) { + SettleCheckBizItemDto result = new SettleCheckBizItemDto(); + result.setId(item.getId()); + result.setCode(item.getCode()); + result.setTotalAmount(item.getTotalAmount()); + result.setApproveTime(item.getApproveTime()); + result.setBizType(SettleCheckSheetBizType.SETTLE_PRE_SHEET); + result.setCalcType(SettleCheckSheetCalcType.SUB); + + results.add(result); + } } - @Override - public List getApprovedList(String supplierId, LocalDateTime startTime, LocalDateTime endTime) { - - return getBaseMapper().getApprovedList(supplierId, startTime, endTime); + results.stream().filter(t -> t.getCalcType() == SettleCheckSheetCalcType.SUB) + .forEach(t -> t.setTotalAmount(t.getTotalAmount().negate())); + + return results; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int setUnSettle(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .set(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE) + .eq(SettleCheckSheet::getId, id) + .eq(SettleCheckSheet::getSettleStatus, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); + + return count; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int setPartSettle(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .set(SettleCheckSheet::getSettleStatus, SettleStatus.PART_SETTLE) + .eq(SettleCheckSheet::getId, id) + .in(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); + + return count; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int setSettled(String id) { + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .set(SettleCheckSheet::getSettleStatus, SettleStatus.SETTLED) + .eq(SettleCheckSheet::getId, id) + .in(SettleCheckSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); + + //将所有的单据的结算状态更新 + Wrapper queryDetailWrapper = Wrappers.lambdaQuery( + SettleCheckSheetDetail.class) + .eq(SettleCheckSheetDetail::getSheetId, id).orderByAsc(SettleCheckSheetDetail::getOrderNo); + List sheetDetails = settleCheckSheetDetailService.list( + queryDetailWrapper); + for (SettleCheckSheetDetail sheetDetail : sheetDetails) { + this.setBizItemSettled(sheetDetail.getBizId(), sheetDetail.getBizType()); } - @Transactional(rollbackFor = Exception.class) - @Override - public void setSettleAmount(String id, BigDecimal totalPayedAmount, BigDecimal totalDiscountAmount) { - - SettleCheckSheet checkSheet = getBaseMapper().selectById(id); - BigDecimal remainTotalPayAmount = NumberUtil.sub(checkSheet.getTotalPayAmount(), - checkSheet.getTotalPayedAmount(), checkSheet.getTotalDiscountAmount(), totalPayedAmount, - totalDiscountAmount); - BigDecimal totalPayAmount = NumberUtil.sub(checkSheet.getTotalPayAmount(), checkSheet.getTotalPayedAmount(), - checkSheet.getTotalDiscountAmount()); - if (NumberUtil.lt(checkSheet.getTotalPayAmount(), 0)) { - if (NumberUtil.gt(remainTotalPayAmount, 0)) { - throw new DefaultClientException( - "对账单：" + checkSheet.getCode() + "，剩余付款金额为" + totalPayAmount + "元，本次付款金额为" + NumberUtil.add( - totalPayedAmount, totalDiscountAmount) + "元，无法结算！"); - } - } - if (NumberUtil.gt(checkSheet.getTotalPayAmount(), 0)) { - if (NumberUtil.lt(remainTotalPayAmount, 0)) { - throw new DefaultClientException( - "对账单：" + checkSheet.getCode() + "，剩余付款金额为" + totalPayAmount + "元，本次付款金额为" + NumberUtil.add( - totalPayedAmount, totalDiscountAmount) + "元，无法结算！"); - } - } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) - .set(SettleCheckSheet::getTotalPayedAmount, - NumberUtil.add(totalPayedAmount, checkSheet.getTotalPayedAmount())) - .set(SettleCheckSheet::getTotalDiscountAmount, - NumberUtil.add(totalDiscountAmount, checkSheet.getTotalDiscountAmount())) - .eq(SettleCheckSheet::getId, id) - .eq(SettleCheckSheet::getTotalPayedAmount, checkSheet.getTotalPayedAmount()) - .eq(SettleCheckSheet::getTotalDiscountAmount, checkSheet.getTotalDiscountAmount()); - if (getBaseMapper().update(updateWrapper) != 1) { - throw new DefaultClientException("结账单：" + checkSheet.getCode() + "，信息已过期，请刷新重试！"); - } - - if (NumberUtil.equal(remainTotalPayAmount, 0)) { - this.setSettled(id); - } + return count; + } + + @Override + public List getApprovedList(String supplierId, LocalDateTime startTime, + LocalDateTime endTime) { + + return getBaseMapper().getApprovedList(supplierId, startTime, endTime); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void setSettleAmount(String id, BigDecimal totalPayedAmount, + BigDecimal totalDiscountAmount) { + + SettleCheckSheet checkSheet = getBaseMapper().selectById(id); + BigDecimal remainTotalPayAmount = NumberUtil.sub(checkSheet.getTotalPayAmount(), + checkSheet.getTotalPayedAmount(), checkSheet.getTotalDiscountAmount(), totalPayedAmount, + totalDiscountAmount); + BigDecimal totalPayAmount = NumberUtil.sub(checkSheet.getTotalPayAmount(), + checkSheet.getTotalPayedAmount(), + checkSheet.getTotalDiscountAmount()); + if (NumberUtil.lt(checkSheet.getTotalPayAmount(), 0)) { + if (NumberUtil.gt(remainTotalPayAmount, 0)) { + throw new DefaultClientException( + "对账单：" + checkSheet.getCode() + "，剩余付款金额为" + totalPayAmount + "元，本次付款金额为" + + NumberUtil.add( + totalPayedAmount, totalDiscountAmount) + "元，无法结算！"); + } + } + if (NumberUtil.gt(checkSheet.getTotalPayAmount(), 0)) { + if (NumberUtil.lt(remainTotalPayAmount, 0)) { + throw new DefaultClientException( + "对账单：" + checkSheet.getCode() + "，剩余付款金额为" + totalPayAmount + "元，本次付款金额为" + + NumberUtil.add( + totalPayedAmount, totalDiscountAmount) + "元，无法结算！"); + } + } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleCheckSheet.class) + .set(SettleCheckSheet::getTotalPayedAmount, + NumberUtil.add(totalPayedAmount, checkSheet.getTotalPayedAmount())) + .set(SettleCheckSheet::getTotalDiscountAmount, + NumberUtil.add(totalDiscountAmount, checkSheet.getTotalDiscountAmount())) + .eq(SettleCheckSheet::getId, id) + .eq(SettleCheckSheet::getTotalPayedAmount, checkSheet.getTotalPayedAmount()) + .eq(SettleCheckSheet::getTotalDiscountAmount, checkSheet.getTotalDiscountAmount()); + if (getBaseMapper().update(updateWrapper) != 1) { + throw new DefaultClientException( + "结账单：" + checkSheet.getCode() + "，信息已过期，请刷新重试！"); } - private void create(SettleCheckSheet sheet, CreateSettleCheckSheetVo vo) { - - BigDecimal totalAmount = BigDecimal.ZERO; - BigDecimal totalPayAmount = BigDecimal.ZERO; - - int orderNo = 0; - for (SettleCheckSheetItemVo itemVo : vo.getItems()) { - orderNo++; - SettleCheckBizItemDto item = this.getBizItem(itemVo.getId(), - EnumUtil.getByCode(SettleCheckSheetBizType.class, itemVo.getBizType())); - if (item == null) { - throw new DefaultClientException("第" + orderNo + "行业务单据不存在！"); - } - SettleCheckSheetDetail detail = new SettleCheckSheetDetail(); - - detail.setId(IdUtil.getId()); - detail.setSheetId(sheet.getId()); - detail.setBizId(itemVo.getId()); - detail.setBizType(EnumUtil.getByCode(SettleCheckSheetBizType.class, itemVo.getBizType())); - detail.setCalcType(item.getCalcType()); - if (item.getCalcType() == SettleCheckSheetCalcType.ADD) { - if (NumberUtil.lt(itemVo.getPayAmount(), BigDecimal.ZERO)) { - throw new DefaultClientException("第" + orderNo + "行业务单据应付金额不允许小于0！"); - } - } else { - if (NumberUtil.gt(itemVo.getPayAmount(), BigDecimal.ZERO)) { - throw new DefaultClientException("第" + orderNo + "行业务单据应付金额不允许大于0！"); - } - } - detail.setPayAmount(itemVo.getPayAmount()); - detail.setDescription(itemVo.getDescription()); - detail.setOrderNo(orderNo); - - settleCheckSheetDetailService.save(detail); - - totalAmount = NumberUtil.add(totalAmount, item.getTotalAmount()); - totalPayAmount = NumberUtil.add(totalPayAmount, itemVo.getPayAmount()); - - //将所有的单据的结算状态更新 - this.setBizItemPartSettle(detail.getBizId(), detail.getBizType()); - } - - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); - - sheet.setSupplierId(vo.getSupplierId()); - sheet.setTotalAmount(totalAmount); - sheet.setTotalPayAmount(totalPayAmount); - sheet.setTotalPayedAmount(BigDecimal.ZERO); - sheet.setTotalDiscountAmount(BigDecimal.ZERO); - sheet.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - sheet.setRefuseReason(StringPool.EMPTY_STR); - sheet.setSettleStatus(SettleStatus.UN_SETTLE); - sheet.setStartDate(vo.getStartDate()); - sheet.setEndDate(vo.getEndDate()); + if (NumberUtil.equal(remainTotalPayAmount, 0)) { + this.setSettled(id); } + } + + private void create(SettleCheckSheet sheet, CreateSettleCheckSheetVo vo) { + + BigDecimal totalAmount = BigDecimal.ZERO; + BigDecimal totalPayAmount = BigDecimal.ZERO; + + int orderNo = 0; + for (SettleCheckSheetItemVo itemVo : vo.getItems()) { + orderNo++; + SettleCheckBizItemDto item = this.getBizItem(itemVo.getId(), + EnumUtil.getByCode(SettleCheckSheetBizType.class, itemVo.getBizType())); + if (item == null) { + throw new DefaultClientException("第" + orderNo + "行业务单据不存在！"); + } + SettleCheckSheetDetail detail = new SettleCheckSheetDetail(); + + detail.setId(IdUtil.getId()); + detail.setSheetId(sheet.getId()); + detail.setBizId(itemVo.getId()); + detail.setBizType(EnumUtil.getByCode(SettleCheckSheetBizType.class, itemVo.getBizType())); + detail.setCalcType(item.getCalcType()); + if (item.getCalcType() == SettleCheckSheetCalcType.ADD) { + if (NumberUtil.lt(itemVo.getPayAmount(), BigDecimal.ZERO)) { + throw new DefaultClientException("第" + orderNo + "行业务单据应付金额不允许小于0！"); + } + } else { + if (NumberUtil.gt(itemVo.getPayAmount(), BigDecimal.ZERO)) { + throw new DefaultClientException("第" + orderNo + "行业务单据应付金额不允许大于0！"); + } + } + detail.setPayAmount(itemVo.getPayAmount()); + detail.setDescription(itemVo.getDescription()); + detail.setOrderNo(orderNo); + + settleCheckSheetDetailService.save(detail); + + totalAmount = NumberUtil.add(totalAmount, item.getTotalAmount()); + totalPayAmount = NumberUtil.add(totalPayAmount, itemVo.getPayAmount()); + + //将所有的单据的结算状态更新 + this.setBizItemPartSettle(detail.getBizId(), detail.getBizType()); + } + + AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); + + sheet.setSupplierId(vo.getSupplierId()); + sheet.setTotalAmount(totalAmount); + sheet.setTotalPayAmount(totalPayAmount); + sheet.setTotalPayedAmount(BigDecimal.ZERO); + sheet.setTotalDiscountAmount(BigDecimal.ZERO); + sheet.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + sheet.setRefuseReason(StringPool.EMPTY_STR); + sheet.setSettleStatus(SettleStatus.UN_SETTLE); + sheet.setStartDate(vo.getStartDate()); + sheet.setEndDate(vo.getEndDate()); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetServiceImpl.java index 6dbb10fb889a1069f8ef4e1eb4abe3d4cda4b44a..4014f5f783b4e40cd8593a3f2f5e3cef79a9a3e8 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleFeeSheetServiceImpl.java @@ -4,24 +4,24 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.fee.SettleFeeSheetFullDto; @@ -39,14 +39,10 @@ import com.lframework.xingyun.settle.service.SettleInItemService; import com.lframework.xingyun.settle.service.SettleOutItemService; import com.lframework.xingyun.settle.vo.fee.ApprovePassSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.ApproveRefuseSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.BatchApprovePassSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.BatchApproveRefuseSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.CreateSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.QuerySettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.SettleFeeSheetItemVo; import com.lframework.xingyun.settle.vo.fee.UpdateSettleFeeSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -56,385 +52,338 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -public class SettleFeeSheetServiceImpl extends BaseMpServiceImpl - implements SettleFeeSheetService { +public class SettleFeeSheetServiceImpl extends + BaseMpServiceImpl + implements SettleFeeSheetService { - @Autowired - private SettleFeeSheetDetailService settleFeeSheetDetailService; + @Autowired + private SettleFeeSheetDetailService settleFeeSheetDetailService; - @Autowired - private SettleOutItemService settleOutItemService; + @Autowired + private SettleOutItemService settleOutItemService; - @Autowired - private SettleInItemService settleInItemService; + @Autowired + private SettleInItemService settleInItemService; - @Autowired - private GenerateCodeService generateCodeService; + @Autowired + private GenerateCodeService generateCodeService; - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySettleFeeSheetVo vo) { + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySettleFeeSheetVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Override - public List query(QuerySettleFeeSheetVo vo) { + return PageResultUtil.convert(new PageInfo<>(datas)); + } - return getBaseMapper().query(vo); - } + @Override + public List query(QuerySettleFeeSheetVo vo) { - @Override - public SettleFeeSheetFullDto getDetail(String id) { + return getBaseMapper().query(vo); + } - return getBaseMapper().getDetail(id); - } + @Override + public SettleFeeSheetFullDto getDetail(String id) { - @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建费用单") - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSettleFeeSheetVo vo) { + return getBaseMapper().getDetail(id); + } - SettleFeeSheet sheet = new SettleFeeSheet(); + @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建费用单") + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateSettleFeeSheetVo vo) { - sheet.setId(IdUtil.getId()); - sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_FEE_SHEET)); + SettleFeeSheet sheet = new SettleFeeSheet(); - this.create(sheet, vo); + sheet.setId(IdUtil.getId()); + sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_FEE_SHEET)); - sheet.setStatus(SettleFeeSheetStatus.CREATED); + this.create(sheet, vo); - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + sheet.setStatus(SettleFeeSheetStatus.CREATED); - getBaseMapper().insert(sheet); + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); - return sheet.getId(); - } + getBaseMapper().insert(sheet); - @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改费用单") - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSettleFeeSheetVo vo) { + return sheet.getId(); + } - SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商费用单不存在！"); - } + @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改费用单") + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSettleFeeSheetVo vo) { - if (sheet.getStatus() != SettleFeeSheetStatus.CREATED - && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商费用单已审核通过，无法修改！"); - } else { - throw new DefaultClientException("供应商费用单无法修改！"); - } - } + SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商费用单不存在！"); + } - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettleFeeSheetDetail.class) - .eq(SettleFeeSheetDetail::getSheetId, sheet.getId()); - settleFeeSheetDetailService.remove(deleteDetailWrapper); + if (sheet.getStatus() != SettleFeeSheetStatus.CREATED + && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商费用单已审核通过，无法修改！"); + } else { + throw new DefaultClientException("供应商费用单无法修改！"); + } + } - this.create(sheet, vo); + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettleFeeSheetDetail.class) + .eq(SettleFeeSheetDetail::getSheetId, sheet.getId()); + settleFeeSheetDetailService.remove(deleteDetailWrapper); - sheet.setStatus(SettleFeeSheetStatus.CREATED); + this.create(sheet, vo); - List statusList = new ArrayList<>(); - statusList.add(SettleFeeSheetStatus.CREATED); - statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); + sheet.setStatus(SettleFeeSheetStatus.CREATED); - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .set(SettleFeeSheet::getApproveBy, null).set(SettleFeeSheet::getApproveTime, null) - .set(SettleFeeSheet::getRefuseReason, StringPool.EMPTY_STR).eq(SettleFeeSheet::getId, sheet.getId()) - .in(SettleFeeSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); - } + List statusList = new ArrayList<>(); + statusList.add(SettleFeeSheetStatus.CREATED); + statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .set(SettleFeeSheet::getApproveBy, null).set(SettleFeeSheet::getApproveTime, null) + .set(SettleFeeSheet::getRefuseReason, StringPool.EMPTY_STR) + .eq(SettleFeeSheet::getId, sheet.getId()) + .in(SettleFeeSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void approvePass(ApprovePassSettleFeeSheetVo vo) { - - SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商费用单不存在！"); - } - - if (sheet.getStatus() != SettleFeeSheetStatus.CREATED - && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商费用单已审核通过，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商费用单无法审核通过！"); - } + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - sheet.setStatus(SettleFeeSheetStatus.APPROVE_PASS); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - if (!StringUtil.isBlank(vo.getDescription())) { - sheet.setDescription(vo.getDescription()); - } + @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public void approvePass(ApprovePassSettleFeeSheetVo vo) { - List statusList = new ArrayList<>(); - statusList.add(SettleFeeSheetStatus.CREATED); - statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); + SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商费用单不存在！"); + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .eq(SettleFeeSheet::getId, sheet.getId()).in(SettleFeeSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); - } + if (sheet.getStatus() != SettleFeeSheetStatus.CREATED + && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商费用单已审核通过，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商费用单无法审核通过！"); + } - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + sheet.setStatus(SettleFeeSheetStatus.APPROVE_PASS); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + if (!StringUtil.isBlank(vo.getDescription())) { + sheet.setDescription(vo.getDescription()); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public String directApprovePass(CreateSettleFeeSheetVo vo) { + List statusList = new ArrayList<>(); + statusList.add(SettleFeeSheetStatus.CREATED); + statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); - SettleFeeSheetService thisService = getThis(this.getClass()); + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .eq(SettleFeeSheet::getId, sheet.getId()).in(SettleFeeSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); + } - String id = thisService.create(vo); + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - ApprovePassSettleFeeSheetVo approveVo = new ApprovePassSettleFeeSheetVo(); - approveVo.setId(id); + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public String directApprovePass(CreateSettleFeeSheetVo vo) { - thisService.approvePass(approveVo); + SettleFeeSheetService thisService = getThis(this.getClass()); - return id; - } + String id = thisService.create(vo); - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void approveRefuse(ApproveRefuseSettleFeeSheetVo vo) { + ApprovePassSettleFeeSheetVo approveVo = new ApprovePassSettleFeeSheetVo(); + approveVo.setId(id); - SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商费用单不存在！"); - } + thisService.approvePass(approveVo); - if (sheet.getStatus() != SettleFeeSheetStatus.CREATED) { - if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商费用单已审核通过，不允许继续执行审核！"); - } - if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_REFUSE) { - throw new DefaultClientException("供应商费用单已审核拒绝，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商费用单无法审核拒绝！"); - } + return id; + } - sheet.setStatus(SettleFeeSheetStatus.APPROVE_REFUSE); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - sheet.setRefuseReason(vo.getRefuseReason()); + @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @Transactional(rollbackFor = Exception.class) + @Override + public void approveRefuse(ApproveRefuseSettleFeeSheetVo vo) { - List statusList = new ArrayList<>(); - statusList.add(SettleFeeSheetStatus.CREATED); - statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .eq(SettleFeeSheet::getId, sheet.getId()).in(SettleFeeSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + SettleFeeSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商费用单不存在！"); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassSettleFeeSheetVo vo) { - - SettleFeeSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassSettleFeeSheetVo approveVo = new ApprovePassSettleFeeSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商费用单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } + if (sheet.getStatus() != SettleFeeSheetStatus.CREATED) { + if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商费用单已审核通过，不允许继续执行审核！"); + } + if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_REFUSE) { + throw new DefaultClientException("供应商费用单已审核拒绝，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商费用单无法审核拒绝！"); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseSettleFeeSheetVo vo) { - - SettleFeeSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseSettleFeeSheetVo approveVo = new ApproveRefuseSettleFeeSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商费用单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } - } + sheet.setStatus(SettleFeeSheetStatus.APPROVE_REFUSE); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + sheet.setRefuseReason(vo.getRefuseReason()); - @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商费用单，单号：{}", params = "#code") - @OrderTimeLineLog(orderId = "#id", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { + List statusList = new ArrayList<>(); + statusList.add(SettleFeeSheetStatus.CREATED); + statusList.add(SettleFeeSheetStatus.APPROVE_REFUSE); - Assert.notBlank(id); - SettleFeeSheet sheet = getBaseMapper().selectById(id); - if (sheet == null) { - throw new InputErrorException("供应商费用单不存在！"); - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .eq(SettleFeeSheet::getId, sheet.getId()).in(SettleFeeSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); + } - if (sheet.getStatus() != SettleFeeSheetStatus.CREATED - && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("“审核通过”的供应商费用单不允许执行删除操作！"); - } + @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商费用单，单号：{}", params = "#code") + @OrderTimeLineLog(orderId = "#id", delete = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(String id) { - throw new DefaultClientException("供应商费用单无法删除！"); - } + Assert.notBlank(id); + SettleFeeSheet sheet = getBaseMapper().selectById(id); + if (sheet == null) { + throw new InputErrorException("供应商费用单不存在！"); + } - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettleFeeSheetDetail.class) - .eq(SettleFeeSheetDetail::getSheetId, sheet.getId()); - settleFeeSheetDetailService.remove(deleteDetailWrapper); + if (sheet.getStatus() != SettleFeeSheetStatus.CREATED + && sheet.getStatus() != SettleFeeSheetStatus.APPROVE_REFUSE) { - // 删除单据 - getBaseMapper().deleteById(id); + if (sheet.getStatus() == SettleFeeSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("“审核通过”的供应商费用单不允许执行删除操作！"); + } - OpLogUtil.setVariable("code", sheet.getCode()); + throw new DefaultClientException("供应商费用单无法删除！"); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettleFeeSheetDetail.class) + .eq(SettleFeeSheetDetail::getSheetId, sheet.getId()); + settleFeeSheetDetailService.remove(deleteDetailWrapper); + + // 删除单据 + Wrapper deleteWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .eq(SettleFeeSheet::getId, sheet.getId()) + .in(SettleFeeSheet::getStatus, SettleFeeSheetStatus.CREATED, + SettleFeeSheetStatus.APPROVE_REFUSE); + if (!remove(deleteWrapper)) { + throw new DefaultClientException("供应商费用单信息已过期，请刷新重试！"); + } - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { + OpLogUtil.setVariable("code", sheet.getCode()); + } - try { - SettleFeeSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商费用单删除失败，失败原因：" + e.getMsg()); - } + @Transactional(rollbackFor = Exception.class) + @Override + public int setUnSettle(String id) { - orderNo++; - } - } - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .set(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE).eq(SettleFeeSheet::getId, id) + .eq(SettleFeeSheet::getSettleStatus, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); - @Transactional(rollbackFor = Exception.class) - @Override - public int setUnSettle(String id) { + return count; + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .set(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE).eq(SettleFeeSheet::getId, id) - .eq(SettleFeeSheet::getSettleStatus, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + @Transactional(rollbackFor = Exception.class) + @Override + public int setPartSettle(String id) { - return count; - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .set(SettleFeeSheet::getSettleStatus, SettleStatus.PART_SETTLE) + .eq(SettleFeeSheet::getId, id) + .in(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); - @Transactional(rollbackFor = Exception.class) - @Override - public int setPartSettle(String id) { + return count; + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .set(SettleFeeSheet::getSettleStatus, SettleStatus.PART_SETTLE).eq(SettleFeeSheet::getId, id) - .in(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + @Transactional(rollbackFor = Exception.class) + @Override + public int setSettled(String id) { - return count; - } + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) + .set(SettleFeeSheet::getSettleStatus, SettleStatus.SETTLED).eq(SettleFeeSheet::getId, id) + .in(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); - @Transactional(rollbackFor = Exception.class) - @Override - public int setSettled(String id) { + return count; + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleFeeSheet.class) - .set(SettleFeeSheet::getSettleStatus, SettleStatus.SETTLED).eq(SettleFeeSheet::getId, id) - .in(SettleFeeSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + @Override + public List getApprovedList(String supplierId, LocalDateTime startTime, + LocalDateTime endTime, + SettleStatus settleStatus) { - return count; - } + return getBaseMapper().getApprovedList(supplierId, startTime, endTime, settleStatus); + } - @Override - public List getApprovedList(String supplierId, LocalDateTime startTime, LocalDateTime endTime, - SettleStatus settleStatus) { + private void create(SettleFeeSheet sheet, CreateSettleFeeSheetVo vo) { - return getBaseMapper().getApprovedList(supplierId, startTime, endTime, settleStatus); - } + BigDecimal totalAmount = BigDecimal.ZERO; - private void create(SettleFeeSheet sheet, CreateSettleFeeSheetVo vo) { - - BigDecimal totalAmount = BigDecimal.ZERO; - - int orderNo = 1; - for (SettleFeeSheetItemVo itemVo : vo.getItems()) { - if (vo.getSheetType() == SettleFeeSheetType.RECEIVE.getCode().intValue()) { - SettleInItem item = settleInItemService.findById(itemVo.getId()); - if (item == null) { - throw new DefaultClientException("第" + orderNo + "行项目不存在！"); - } - } else { - SettleOutItem item = settleOutItemService.findById(itemVo.getId()); - if (item == null) { - throw new DefaultClientException("第" + orderNo + "行项目不存在！"); - } - } - SettleFeeSheetDetail detail = new SettleFeeSheetDetail(); - detail.setId(IdUtil.getId()); - detail.setSheetId(sheet.getId()); - detail.setItemId(itemVo.getId()); - detail.setAmount(itemVo.getAmount()); - detail.setOrderNo(orderNo); - - settleFeeSheetDetailService.save(detail); - - totalAmount = NumberUtil.add(totalAmount, detail.getAmount()); - - orderNo++; + int orderNo = 1; + for (SettleFeeSheetItemVo itemVo : vo.getItems()) { + if (vo.getSheetType() == SettleFeeSheetType.RECEIVE.getCode().intValue()) { + SettleInItem item = settleInItemService.findById(itemVo.getId()); + if (item == null) { + throw new DefaultClientException("第" + orderNo + "行项目不存在！"); + } + } else { + SettleOutItem item = settleOutItemService.findById(itemVo.getId()); + if (item == null) { + throw new DefaultClientException("第" + orderNo + "行项目不存在！"); } + } + SettleFeeSheetDetail detail = new SettleFeeSheetDetail(); + detail.setId(IdUtil.getId()); + detail.setSheetId(sheet.getId()); + detail.setItemId(itemVo.getId()); + detail.setAmount(itemVo.getAmount()); + detail.setOrderNo(orderNo); + + settleFeeSheetDetailService.save(detail); - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); + totalAmount = NumberUtil.add(totalAmount, detail.getAmount()); - sheet.setSupplierId(vo.getSupplierId()); - sheet.setSheetType(EnumUtil.getByCode(SettleFeeSheetType.class, vo.getSheetType())); - sheet.setTotalAmount(totalAmount); - sheet.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - sheet.setRefuseReason(StringPool.EMPTY_STR); - sheet.setSettleStatus(SettleStatus.UN_SETTLE); + orderNo++; } + + AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); + + sheet.setSupplierId(vo.getSupplierId()); + sheet.setSheetType(EnumUtil.getByCode(SettleFeeSheetType.class, vo.getSheetType())); + sheet.setTotalAmount(totalAmount); + sheet.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + sheet.setRefuseReason(StringPool.EMPTY_STR); + sheet.setSettleStatus(SettleStatus.UN_SETTLE); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleInItemServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleInItemServiceImpl.java index efe5e3ca88851a3a67940c8287bea2f2b62eca0f..06de78b0f2e103dcff91e59027aa80c034477081 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleInItemServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleInItemServiceImpl.java @@ -23,8 +23,8 @@ import com.lframework.xingyun.settle.vo.item.in.CreateSettleInItemVo; import com.lframework.xingyun.settle.vo.item.in.QuerySettleInItemVo; import com.lframework.xingyun.settle.vo.item.in.SettleInItemSelectorVo; import com.lframework.xingyun.settle.vo.item.in.UpdateSettleInItemVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -74,31 +74,23 @@ public class SettleInItemServiceImpl extends BaseMpServiceImpl ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleInItem.class) - .set(SettleInItem::getAvailable, Boolean.FALSE).in(SettleInItem::getId, ids); + .set(SettleInItem::getAvailable, Boolean.FALSE).eq(SettleInItem::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = SettleOpLogType.SETTLE, name = "启用收入项目，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = SettleOpLogType.SETTLE, name = "启用收入项目，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleInItem.class) - .set(SettleInItem::getAvailable, Boolean.TRUE).in(SettleInItem::getId, ids); + .set(SettleInItem::getAvailable, Boolean.TRUE).eq(SettleInItem::getId, id); getBaseMapper().update(updateWrapper); } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleOutItemServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleOutItemServiceImpl.java index cca164af6d5b6754bc9486753aa7505846177ee2..c0bc1e1e726244d190795d58662d9a339fc4a7f7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleOutItemServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleOutItemServiceImpl.java @@ -23,8 +23,8 @@ import com.lframework.xingyun.settle.vo.item.out.CreateSettleOutItemVo; import com.lframework.xingyun.settle.vo.item.out.QuerySettleOutItemVo; import com.lframework.xingyun.settle.vo.item.out.SettleOutItemSelectorVo; import com.lframework.xingyun.settle.vo.item.out.UpdateSettleOutItemVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -74,31 +74,23 @@ public class SettleOutItemServiceImpl extends BaseMpServiceImpl ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleOutItem.class) - .set(SettleOutItem::getAvailable, Boolean.FALSE).in(SettleOutItem::getId, ids); + .set(SettleOutItem::getAvailable, Boolean.FALSE).eq(SettleOutItem::getId, id); getBaseMapper().update(updateWrapper); } - @OpLog(type = SettleOpLogType.SETTLE, name = "启用支出项目，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = SettleOpLogType.SETTLE, name = "启用支出项目，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SettleOutItem.class) - .set(SettleOutItem::getAvailable, Boolean.TRUE).in(SettleOutItem::getId, ids); + .set(SettleOutItem::getAvailable, Boolean.TRUE).eq(SettleOutItem::getId, id); getBaseMapper().update(updateWrapper); } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettlePreSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettlePreSheetServiceImpl.java index eafaf65813d082f5cef64449763e2b52ba1c6ca8..509c10ae06c299f70f485106019798d7ba1da058 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettlePreSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettlePreSheetServiceImpl.java @@ -4,23 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.sc.enums.SettleStatus; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.pre.SettlePreSheetFullDto; @@ -35,15 +35,10 @@ import com.lframework.xingyun.settle.service.SettlePreSheetDetailService; import com.lframework.xingyun.settle.service.SettlePreSheetService; import com.lframework.xingyun.settle.vo.pre.ApprovePassSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.ApproveRefuseSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.BatchApprovePassSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.BatchApproveRefuseSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.CreateSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.QuerySettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.SettlePreSheetItemVo; import com.lframework.xingyun.settle.vo.pre.UpdateSettlePreSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -53,374 +48,326 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -public class SettlePreSheetServiceImpl extends BaseMpServiceImpl - implements SettlePreSheetService { +public class SettlePreSheetServiceImpl extends + BaseMpServiceImpl + implements SettlePreSheetService { - @Autowired - private SettlePreSheetDetailService settlePreSheetDetailService; + @Autowired + private SettlePreSheetDetailService settlePreSheetDetailService; - @Autowired - private SettleOutItemService settleOutItemService; + @Autowired + private SettleOutItemService settleOutItemService; - @Autowired - private GenerateCodeService generateCodeService; + @Autowired + private GenerateCodeService generateCodeService; - @Override - public PageResult query(Integer pageIndex, Integer pageSize, QuerySettlePreSheetVo vo) { + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySettlePreSheetVo vo) { - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); - PageHelperUtil.startPage(pageIndex, pageSize); - List datas = this.query(vo); + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); - return PageResultUtil.convert(new PageInfo<>(datas)); - } + return PageResultUtil.convert(new PageInfo<>(datas)); + } - @Override - public List query(QuerySettlePreSheetVo vo) { + @Override + public List query(QuerySettlePreSheetVo vo) { - return getBaseMapper().query(vo); - } + return getBaseMapper().query(vo); + } - @Override - public SettlePreSheetFullDto getDetail(String id) { + @Override + public SettlePreSheetFullDto getDetail(String id) { - return getBaseMapper().getDetail(id); - } + return getBaseMapper().getDetail(id); + } - @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建预付款单") - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSettlePreSheetVo vo) { + @OpLog(type = SettleOpLogType.SETTLE, name = "创建供应商预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.CREATE, orderId = "#_result", name = "创建预付款单") + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateSettlePreSheetVo vo) { - SettlePreSheet sheet = new SettlePreSheet(); + SettlePreSheet sheet = new SettlePreSheet(); - sheet.setId(IdUtil.getId()); - sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_PRE_SHEET)); + sheet.setId(IdUtil.getId()); + sheet.setCode(generateCodeService.generate(GenerateCodeTypePool.SETTLE_PRE_SHEET)); - this.create(sheet, vo); + this.create(sheet, vo); - sheet.setStatus(SettlePreSheetStatus.CREATED); + sheet.setStatus(SettlePreSheetStatus.CREATED); - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); - getBaseMapper().insert(sheet); + getBaseMapper().insert(sheet); - return sheet.getId(); - } + return sheet.getId(); + } + + @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改预付款单") + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSettlePreSheetVo vo) { - @OpLog(type = SettleOpLogType.SETTLE, name = "修改供应商预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.UPDATE, orderId = "#vo.id", name = "修改预付款单") - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSettlePreSheetVo vo) { - - SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商预付款单不存在！"); - } - - if (sheet.getStatus() != SettlePreSheetStatus.CREATED - && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商预付款单已审核通过，无法修改！"); - } else { - throw new DefaultClientException("供应商预付款单无法修改！"); - } - } - - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettlePreSheetDetail.class) - .eq(SettlePreSheetDetail::getSheetId, sheet.getId()); - settlePreSheetDetailService.remove(deleteDetailWrapper); - - this.create(sheet, vo); - - sheet.setStatus(SettlePreSheetStatus.CREATED); - - List statusList = new ArrayList<>(); - statusList.add(SettlePreSheetStatus.CREATED); - statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .set(SettlePreSheet::getApproveBy, null).set(SettlePreSheet::getApproveTime, null) - .set(SettlePreSheet::getRefuseReason, StringPool.EMPTY_STR).eq(SettlePreSheet::getId, sheet.getId()) - .in(SettlePreSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商预付款单不存在！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void approvePass(ApprovePassSettlePreSheetVo vo) { - - SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商预付款单不存在！"); - } - - if (sheet.getStatus() != SettlePreSheetStatus.CREATED - && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { - if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商预付款单已审核通过，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商预付款单无法审核通过！"); - } - - sheet.setStatus(SettlePreSheetStatus.APPROVE_PASS); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - if (!StringUtil.isBlank(vo.getDescription())) { - sheet.setDescription(vo.getDescription()); - } - - List statusList = new ArrayList<>(); - statusList.add(SettlePreSheetStatus.CREATED); - statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .eq(SettlePreSheet::getId, sheet.getId()).in(SettlePreSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + if (sheet.getStatus() != SettlePreSheetStatus.CREATED + && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商预付款单已审核通过，无法修改！"); + } else { + throw new DefaultClientException("供应商预付款单无法修改！"); + } } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public String directApprovePass(CreateSettlePreSheetVo vo) { + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettlePreSheetDetail.class) + .eq(SettlePreSheetDetail::getSheetId, sheet.getId()); + settlePreSheetDetailService.remove(deleteDetailWrapper); + + this.create(sheet, vo); - SettlePreSheetService thisService = getThis(this.getClass()); + sheet.setStatus(SettlePreSheetStatus.CREATED); - String id = thisService.create(vo); + List statusList = new ArrayList<>(); + statusList.add(SettlePreSheetStatus.CREATED); + statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); - ApprovePassSettlePreSheetVo approveVo = new ApprovePassSettlePreSheetVo(); - approveVo.setId(id); + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .set(SettlePreSheet::getApproveBy, null).set(SettlePreSheet::getApproveTime, null) + .set(SettlePreSheet::getRefuseReason, StringPool.EMPTY_STR) + .eq(SettlePreSheet::getId, sheet.getId()) + .in(SettlePreSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); + } + + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - thisService.approvePass(approveVo); + @OpLog(type = SettleOpLogType.SETTLE, name = "审核通过供应商预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.id", name = "审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public void approvePass(ApprovePassSettlePreSheetVo vo) { - return id; + SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商预付款单不存在！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void approveRefuse(ApproveRefuseSettlePreSheetVo vo) { - - SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); - if (sheet == null) { - throw new DefaultClientException("供应商预付款单不存在！"); - } - - if (sheet.getStatus() != SettlePreSheetStatus.CREATED) { - if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("供应商预付款单已审核通过，不允许继续执行审核！"); - } - if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_REFUSE) { - throw new DefaultClientException("供应商预付款单已审核拒绝，不允许继续执行审核！"); - } - throw new DefaultClientException("供应商预付款单无法审核拒绝！"); - } - - sheet.setStatus(SettlePreSheetStatus.APPROVE_REFUSE); - sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); - sheet.setApproveTime(LocalDateTime.now()); - sheet.setRefuseReason(vo.getRefuseReason()); - - List statusList = new ArrayList<>(); - statusList.add(SettlePreSheetStatus.CREATED); - statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .eq(SettlePreSheet::getId, sheet.getId()).in(SettlePreSheet::getStatus, statusList); - if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { - throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); - } - - OpLogUtil.setVariable("code", sheet.getCode()); - OpLogUtil.setExtra(vo); + if (sheet.getStatus() != SettlePreSheetStatus.CREATED + && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { + if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商预付款单已审核通过，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商预付款单无法审核通过！"); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#vo.ids", name = "审核通过") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApprovePass(BatchApprovePassSettlePreSheetVo vo) { - - SettlePreSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApprovePassSettlePreSheetVo approveVo = new ApprovePassSettlePreSheetVo(); - approveVo.setId(id); - try { - thisService.approvePass(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商预付款单审核通过失败，失败原因：" + e.getMsg()); - } - orderNo++; - } + sheet.setStatus(SettlePreSheetStatus.APPROVE_PASS); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + if (!StringUtil.isBlank(vo.getDescription())) { + sheet.setDescription(vo.getDescription()); } - @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.ids", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") - @Transactional(rollbackFor = Exception.class) - @Override - public void batchApproveRefuse(BatchApproveRefuseSettlePreSheetVo vo) { - - SettlePreSheetService thisService = getThis(this.getClass()); - int orderNo = 1; - for (String id : vo.getIds()) { - ApproveRefuseSettlePreSheetVo approveVo = new ApproveRefuseSettlePreSheetVo(); - approveVo.setId(id); - approveVo.setRefuseReason(vo.getRefuseReason()); - - try { - thisService.approveRefuse(approveVo); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商预付款单审核拒绝失败，失败原因：" + e.getMsg()); - } - orderNo++; - } + List statusList = new ArrayList<>(); + statusList.add(SettlePreSheetStatus.CREATED); + statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .eq(SettlePreSheet::getId, sheet.getId()).in(SettlePreSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); } - @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商预付款单，单号：{}", params = "#code") - @OrderTimeLineLog(orderId = "#id", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteById(String id) { + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - Assert.notBlank(id); - SettlePreSheet sheet = getBaseMapper().selectById(id); - if (sheet == null) { - throw new InputErrorException("供应商预付款单不存在！"); - } + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_PASS, orderId = "#_result", name = "直接审核通过") + @Transactional(rollbackFor = Exception.class) + @Override + public String directApprovePass(CreateSettlePreSheetVo vo) { - if (sheet.getStatus() != SettlePreSheetStatus.CREATED - && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { + SettlePreSheetService thisService = getThis(this.getClass()); - if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { - throw new DefaultClientException("“审核通过”的供应商预付款单不允许执行删除操作！"); - } + String id = thisService.create(vo); - throw new DefaultClientException("供应商预付款单无法删除！"); - } + ApprovePassSettlePreSheetVo approveVo = new ApprovePassSettlePreSheetVo(); + approveVo.setId(id); - // 删除明细 - Wrapper deleteDetailWrapper = Wrappers.lambdaQuery(SettlePreSheetDetail.class) - .eq(SettlePreSheetDetail::getSheetId, sheet.getId()); - settlePreSheetDetailService.remove(deleteDetailWrapper); + thisService.approvePass(approveVo); - // 删除单据 - getBaseMapper().deleteById(id); + return id; + } - OpLogUtil.setVariable("code", sheet.getCode()); + @OpLog(type = SettleOpLogType.SETTLE, name = "审核拒绝供应商预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(type = OrderTimeLineBizType.APPROVE_RETURN, orderId = "#vo.id", name = "审核拒绝，拒绝理由：{}", params = "#vo.refuseReason") + @Transactional(rollbackFor = Exception.class) + @Override + public void approveRefuse(ApproveRefuseSettlePreSheetVo vo) { + + SettlePreSheet sheet = getBaseMapper().selectById(vo.getId()); + if (sheet == null) { + throw new DefaultClientException("供应商预付款单不存在！"); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - SettlePreSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商预付款单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } + if (sheet.getStatus() != SettlePreSheetStatus.CREATED) { + if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("供应商预付款单已审核通过，不允许继续执行审核！"); + } + if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_REFUSE) { + throw new DefaultClientException("供应商预付款单已审核拒绝，不允许继续执行审核！"); + } + throw new DefaultClientException("供应商预付款单无法审核拒绝！"); } - @Transactional(rollbackFor = Exception.class) - @Override - public int setUnSettle(String id) { + sheet.setStatus(SettlePreSheetStatus.APPROVE_REFUSE); + sheet.setApproveBy(SecurityUtil.getCurrentUser().getId()); + sheet.setApproveTime(LocalDateTime.now()); + sheet.setRefuseReason(vo.getRefuseReason()); - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .set(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE).eq(SettlePreSheet::getId, id) - .eq(SettlePreSheet::getSettleStatus, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + List statusList = new ArrayList<>(); + statusList.add(SettlePreSheetStatus.CREATED); + statusList.add(SettlePreSheetStatus.APPROVE_REFUSE); - return count; + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .eq(SettlePreSheet::getId, sheet.getId()).in(SettlePreSheet::getStatus, statusList); + if (getBaseMapper().updateAllColumn(sheet, updateWrapper) != 1) { + throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); } - @Transactional(rollbackFor = Exception.class) - @Override - public int setPartSettle(String id) { + OpLogUtil.setVariable("code", sheet.getCode()); + OpLogUtil.setExtra(vo); + } - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .set(SettlePreSheet::getSettleStatus, SettleStatus.PART_SETTLE).eq(SettlePreSheet::getId, id) - .in(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + @OpLog(type = SettleOpLogType.SETTLE, name = "删除供应商预付款单，单号：{}", params = "#code") + @OrderTimeLineLog(orderId = "#id", delete = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(String id) { - return count; + Assert.notBlank(id); + SettlePreSheet sheet = getBaseMapper().selectById(id); + if (sheet == null) { + throw new InputErrorException("供应商预付款单不存在！"); } - @Transactional(rollbackFor = Exception.class) - @Override - public int setSettled(String id) { + if (sheet.getStatus() != SettlePreSheetStatus.CREATED + && sheet.getStatus() != SettlePreSheetStatus.APPROVE_REFUSE) { - Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) - .set(SettlePreSheet::getSettleStatus, SettleStatus.SETTLED).eq(SettlePreSheet::getId, id) - .in(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); - int count = getBaseMapper().update(updateWrapper); + if (sheet.getStatus() == SettlePreSheetStatus.APPROVE_PASS) { + throw new DefaultClientException("“审核通过”的供应商预付款单不允许执行删除操作！"); + } - return count; + throw new DefaultClientException("供应商预付款单无法删除！"); } - @Override - public List getApprovedList(String supplierId, LocalDateTime startTime, LocalDateTime endTime, - SettleStatus settleStatus) { - - return getBaseMapper().getApprovedList(supplierId, startTime, endTime, settleStatus); + // 删除明细 + Wrapper deleteDetailWrapper = Wrappers.lambdaQuery( + SettlePreSheetDetail.class) + .eq(SettlePreSheetDetail::getSheetId, sheet.getId()); + settlePreSheetDetailService.remove(deleteDetailWrapper); + + // 删除单据 + Wrapper deleteWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .eq(SettlePreSheet::getId, id).in(SettlePreSheet::getStatus, SettlePreSheetStatus.CREATED, + SettlePreSheetStatus.APPROVE_REFUSE); + if (!remove(deleteWrapper)) { + throw new DefaultClientException("供应商预付款单信息已过期，请刷新重试！"); } - private void create(SettlePreSheet sheet, CreateSettlePreSheetVo vo) { + OpLogUtil.setVariable("code", sheet.getCode()); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int setUnSettle(String id) { - BigDecimal totalAmount = BigDecimal.ZERO; + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .set(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE).eq(SettlePreSheet::getId, id) + .eq(SettlePreSheet::getSettleStatus, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); - int orderNo = 1; - for (SettlePreSheetItemVo itemVo : vo.getItems()) { - SettleOutItem item = settleOutItemService.findById(itemVo.getId()); - if (item == null) { - throw new DefaultClientException("第" + orderNo + "行项目不存在！"); - } - SettlePreSheetDetail detail = new SettlePreSheetDetail(); - detail.setId(IdUtil.getId()); - detail.setSheetId(sheet.getId()); - detail.setItemId(itemVo.getId()); - detail.setAmount(itemVo.getAmount()); - detail.setOrderNo(orderNo); + return count; + } - settlePreSheetDetailService.save(detail); + @Transactional(rollbackFor = Exception.class) + @Override + public int setPartSettle(String id) { - totalAmount = NumberUtil.add(totalAmount, detail.getAmount()); + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .set(SettlePreSheet::getSettleStatus, SettleStatus.PART_SETTLE) + .eq(SettlePreSheet::getId, id) + .in(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); - orderNo++; - } + return count; + } - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); + @Transactional(rollbackFor = Exception.class) + @Override + public int setSettled(String id) { - sheet.setSupplierId(vo.getSupplierId()); - sheet.setTotalAmount(totalAmount); - sheet.setDescription(StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - sheet.setRefuseReason(StringPool.EMPTY_STR); - sheet.setSettleStatus(SettleStatus.UN_SETTLE); + Wrapper updateWrapper = Wrappers.lambdaUpdate(SettlePreSheet.class) + .set(SettlePreSheet::getSettleStatus, SettleStatus.SETTLED).eq(SettlePreSheet::getId, id) + .in(SettlePreSheet::getSettleStatus, SettleStatus.UN_SETTLE, SettleStatus.PART_SETTLE); + int count = getBaseMapper().update(updateWrapper); + + return count; + } + + @Override + public List getApprovedList(String supplierId, LocalDateTime startTime, + LocalDateTime endTime, + SettleStatus settleStatus) { + + return getBaseMapper().getApprovedList(supplierId, startTime, endTime, settleStatus); + } + + private void create(SettlePreSheet sheet, CreateSettlePreSheetVo vo) { + + BigDecimal totalAmount = BigDecimal.ZERO; + + int orderNo = 1; + for (SettlePreSheetItemVo itemVo : vo.getItems()) { + SettleOutItem item = settleOutItemService.findById(itemVo.getId()); + if (item == null) { + throw new DefaultClientException("第" + orderNo + "行项目不存在！"); + } + SettlePreSheetDetail detail = new SettlePreSheetDetail(); + detail.setId(IdUtil.getId()); + detail.setSheetId(sheet.getId()); + detail.setItemId(itemVo.getId()); + detail.setAmount(itemVo.getAmount()); + detail.setOrderNo(orderNo); + + settlePreSheetDetailService.save(detail); + + totalAmount = NumberUtil.add(totalAmount, detail.getAmount()); + + orderNo++; } + + AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); + + sheet.setSupplierId(vo.getSupplierId()); + sheet.setTotalAmount(totalAmount); + sheet.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + sheet.setRefuseReason(StringPool.EMPTY_STR); + sheet.setSettleStatus(SettleStatus.UN_SETTLE); + } } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleSheetServiceImpl.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleSheetServiceImpl.java index 3c1debbe47743f21c23d536ee6b1d8acb27cd77d..bdf0a46090edfdea631f6e84a8bad86090d51558 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleSheetServiceImpl.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/impl/SettleSheetServiceImpl.java @@ -4,23 +4,24 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.ClientException; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.NumberUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.GenerateCodeService; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.core.annations.OrderTimeLineLog; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OrderTimeLineLog; import com.lframework.xingyun.core.enums.OrderTimeLineBizType; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.settle.components.code.GenerateCodeTypePool; import com.lframework.xingyun.settle.dto.sheet.SettleBizItemDto; import com.lframework.xingyun.settle.dto.sheet.SettleSheetFullDto; @@ -35,15 +36,11 @@ import com.lframework.xingyun.settle.service.SettleSheetDetailService; import com.lframework.xingyun.settle.service.SettleSheetService; import com.lframework.xingyun.settle.vo.sheet.ApprovePassSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.ApproveRefuseSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.BatchApprovePassSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.BatchApproveRefuseSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.CreateSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.QuerySettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.QueryUnSettleBizItemVo; import com.lframework.xingyun.settle.vo.sheet.SettleSheetItemVo; import com.lframework.xingyun.settle.vo.sheet.UpdateSettleSheetVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.utils.OpLogUtil; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; @@ -271,46 +268,6 @@ public class SettleSheetServiceImpl extends BaseMpServiceImpl deleteWrapper = Wrappers.lambdaUpdate(SettleSheet.class) + .eq(SettleSheet::getId, id) + .in(SettleSheet::getStatus, SettleSheetStatus.CREATED, SettleSheetStatus.APPROVE_REFUSE); + if (!remove(deleteWrapper)) { + throw new DefaultClientException("供应商结算单信息已过期，请刷新重试！"); + } OpLogUtil.setVariable("code", sheet.getCode()); } - @OrderTimeLineLog(orderId = "#ids", delete = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void deleteByIds(List ids) { - - if (!CollectionUtil.isEmpty(ids)) { - int orderNo = 1; - for (String id : ids) { - - try { - SettleSheetService thisService = getThis(this.getClass()); - thisService.deleteById(id); - } catch (ClientException e) { - throw new DefaultClientException("第" + orderNo + "个供应商结算单删除失败，失败原因：" + e.getMsg()); - } - - orderNo++; - } - } - } - @Override public SettleBizItemDto getBizItem(String id) { @@ -481,7 +422,8 @@ public class SettleSheetServiceImpl extends BaseMpServiceImpl ids); - /** * 查询业务单据 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetService.java index fb0b7c1a96f3cbdabdc33947d666cfc9218bb879..f9fb8c227d815350259bdd52f681f80af374aacd 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleFeeSheetService.java @@ -7,8 +7,6 @@ import com.lframework.xingyun.settle.dto.fee.customer.CustomerSettleFeeSheetFull import com.lframework.xingyun.settle.entity.CustomerSettleFeeSheet; import com.lframework.xingyun.settle.vo.fee.customer.ApprovePassCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.ApproveRefuseCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApprovePassCustomerSettleFeeSheetVo; -import com.lframework.xingyun.settle.vo.fee.customer.BatchApproveRefuseCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.CreateCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.QueryCustomerSettleFeeSheetVo; import com.lframework.xingyun.settle.vo.fee.customer.UpdateCustomerSettleFeeSheetVo; @@ -80,20 +78,6 @@ public interface CustomerSettleFeeSheetService extends BaseMpService ids); - /** * 设置成未结算 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetService.java index f6f4b78453d7422d68c716c8fb5922edb20e283c..4cf63d28425275c1d37823f6e5806826fb7178a0 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettlePreSheetService.java @@ -7,8 +7,6 @@ import com.lframework.xingyun.settle.dto.pre.customer.CustomerSettlePreSheetFull import com.lframework.xingyun.settle.entity.CustomerSettlePreSheet; import com.lframework.xingyun.settle.vo.pre.customer.ApprovePassCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.ApproveRefuseCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApprovePassCustomerSettlePreSheetVo; -import com.lframework.xingyun.settle.vo.pre.customer.BatchApproveRefuseCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.CreateCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.QueryCustomerSettlePreSheetVo; import com.lframework.xingyun.settle.vo.pre.customer.UpdateCustomerSettlePreSheetVo; @@ -80,20 +78,6 @@ public interface CustomerSettlePreSheetService extends BaseMpService ids); - /** * 设置成未结算 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetService.java index 6076f9ad6fa101bf72e1eccd3a5d80bb183aab3a..0cd81d3c233d541ee9029bf674457ab55680597d 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/CustomerSettleSheetService.java @@ -7,8 +7,6 @@ import com.lframework.xingyun.settle.dto.sheet.customer.CustomerSettleSheetFullD import com.lframework.xingyun.settle.entity.CustomerSettleSheet; import com.lframework.xingyun.settle.vo.sheet.customer.ApprovePassCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.ApproveRefuseCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApprovePassCustomerSettleSheetVo; -import com.lframework.xingyun.settle.vo.sheet.customer.BatchApproveRefuseCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.CreateCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerSettleSheetVo; import com.lframework.xingyun.settle.vo.sheet.customer.QueryCustomerUnSettleBizItemVo; @@ -80,20 +78,6 @@ public interface CustomerSettleSheetService extends BaseMpService ids); - /** * 查询业务单据 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetService.java index 37e99b70616e51e75e49904c8503a9e70cab82d8..03029db198f97744bfafd454b3c1ccc453020214 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleCheckSheetService.java @@ -76,20 +76,6 @@ public interface SettleCheckSheetService extends BaseMpService */ void approveRefuse(ApproveRefuseSettleCheckSheetVo vo); - /** - * 批量审核通过 - * - * @param vo - */ - void batchApprovePass(BatchApprovePassSettleCheckSheetVo vo); - - /** - * 批量审核拒绝 - * - * @param vo - */ - void batchApproveRefuse(BatchApproveRefuseSettleCheckSheetVo vo); - /** * 根据ID删除 * @@ -97,13 +83,6 @@ public interface SettleCheckSheetService extends BaseMpService */ void deleteById(String id); - /** - * 根据IDs删除 - * - * @param ids - */ - void deleteByIds(List ids); - /** * 查询业务单据 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetService.java index 99e4dbe5079db4032c592d512ccd8fab30f0c30c..8218ad9f6f11fbfcc1592eae3eb1c0c9f3294b9f 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleFeeSheetService.java @@ -74,20 +74,6 @@ public interface SettleFeeSheetService extends BaseMpService { */ void approveRefuse(ApproveRefuseSettleFeeSheetVo vo); - /** - * 批量审核通过 - * - * @param vo - */ - void batchApprovePass(BatchApprovePassSettleFeeSheetVo vo); - - /** - * 批量审核拒绝 - * - * @param vo - */ - void batchApproveRefuse(BatchApproveRefuseSettleFeeSheetVo vo); - /** * 根据ID删除 * @@ -95,13 +81,6 @@ public interface SettleFeeSheetService extends BaseMpService { */ void deleteById(String id); - /** - * 根据IDs删除 - * - * @param ids - */ - void deleteByIds(List ids); - /** * 设置成未结算 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleInItemService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleInItemService.java index fcfbcbb6b6dff4d355409598bd6b26d1397bb2e3..268130b1c05938450da9d4d179c6ecc43aa76240 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleInItemService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleInItemService.java @@ -46,16 +46,16 @@ public interface SettleInItemService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleOutItemService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleOutItemService.java index d75f1d390f2460b658a3c7d274b38ec147a005a1..e70a302291469e1278ec798d9dfae8f72f155523 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleOutItemService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleOutItemService.java @@ -49,16 +49,16 @@ public interface SettleOutItemService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetService.java index 457f98559585fa237b40bbad5d7ea609feb46b32..128cdc31daf35143c66d51ee02643f15db222bca 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettlePreSheetService.java @@ -74,20 +74,6 @@ public interface SettlePreSheetService extends BaseMpService { */ void approveRefuse(ApproveRefuseSettlePreSheetVo vo); - /** - * 批量审核通过 - * - * @param vo - */ - void batchApprovePass(BatchApprovePassSettlePreSheetVo vo); - - /** - * 批量审核拒绝 - * - * @param vo - */ - void batchApproveRefuse(BatchApproveRefuseSettlePreSheetVo vo); - /** * 根据ID删除 * @@ -95,13 +81,6 @@ public interface SettlePreSheetService extends BaseMpService { */ void deleteById(String id); - /** - * 根据IDs删除 - * - * @param ids - */ - void deleteByIds(List ids); - /** * 设置成未结算 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetService.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetService.java index 9a1be8d191bb7204877b40021ec5abb11e0e7851..2d060272c4812b6511576d4a38dcc34448477e85 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetService.java +++ b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/service/SettleSheetService.java @@ -73,20 +73,6 @@ public interface SettleSheetService extends BaseMpService { */ void approveRefuse(ApproveRefuseSettleSheetVo vo); - /** - * 批量审核通过 - * - * @param vo - */ - void batchApprovePass(BatchApprovePassSettleSheetVo vo); - - /** - * 批量审核拒绝 - * - * @param vo - */ - void batchApproveRefuse(BatchApproveRefuseSettleSheetVo vo); - /** * 根据ID删除 * @@ -94,13 +80,6 @@ public interface SettleSheetService extends BaseMpService { */ void deleteById(String id); - /** - * 根据IDs删除 - * - * @param ids - */ - void deleteByIds(List ids); - /** * 查询业务单据 * diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApprovePassSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApprovePassSettleCheckSheetVo.java deleted file mode 100644 index c195b456b538122217852adf5bb22620901b4d4b..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApprovePassSettleCheckSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.check; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassSettleCheckSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "对账单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApprovePassCustomerSettleCheckSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApprovePassCustomerSettleCheckSheetVo.java deleted file mode 100644 index 1f0b846acca411d1ced86a7fdc28969370579f2e..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApprovePassCustomerSettleCheckSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.check.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassCustomerSettleCheckSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "对账单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApprovePassSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApprovePassSettleFeeSheetVo.java deleted file mode 100644 index 75af822083cf5a71a459a8bb055847651f5ec9a4..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApprovePassSettleFeeSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.fee; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassSettleFeeSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApprovePassCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApprovePassCustomerSettleFeeSheetVo.java deleted file mode 100644 index 5dafc630df2505969e90c5feb9a580f8fc10978d..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApprovePassCustomerSettleFeeSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.fee.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassCustomerSettleFeeSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApproveRefuseCustomerSettleFeeSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApproveRefuseCustomerSettleFeeSheetVo.java deleted file mode 100644 index e94cad204cd1605e4e29dedef48884af4e7069bd..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/customer/BatchApproveRefuseCustomerSettleFeeSheetVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.settle.vo.fee.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApproveRefuseCustomerSettleFeeSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; - - /** - * 拒绝理由 - */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApprovePassSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApprovePassSettlePreSheetVo.java deleted file mode 100644 index 9422224aaddf681fec443ac3fe8aa7ab3289fe5a..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApprovePassSettlePreSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.pre; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassSettlePreSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApprovePassCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApprovePassCustomerSettlePreSheetVo.java deleted file mode 100644 index 7d8f0711764d7b6a72a9fa7b2d2ceb63417c4e69..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApprovePassCustomerSettlePreSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.pre.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassCustomerSettlePreSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApproveRefuseCustomerSettlePreSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApproveRefuseCustomerSettlePreSheetVo.java deleted file mode 100644 index af9d7a8df37e1a1a27c04ca65eb73e6b832956ee..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/customer/BatchApproveRefuseCustomerSettlePreSheetVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.settle.vo.pre.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApproveRefuseCustomerSettlePreSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty("ID") - @NotNull(message = "费用单ID不能为空！") - private List ids; - - /** - * 拒绝理由 - */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApprovePassSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApprovePassSettleSheetVo.java deleted file mode 100644 index f9b35354cc85ccba27d54adf80e37c97769a58d4..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApprovePassSettleSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.sheet; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassSettleSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApproveRefuseSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApproveRefuseSettleSheetVo.java deleted file mode 100644 index ea6e69cf57505ba9ffc7d537685c26c229c1c9a4..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/BatchApproveRefuseSettleSheetVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.settle.vo.sheet; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApproveRefuseSettleSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private List ids; - - /** - * 拒绝理由 - */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApprovePassCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApprovePassCustomerSettleSheetVo.java deleted file mode 100644 index dfc05edf6984a9022c284276dcdc6cb217e20bae..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApprovePassCustomerSettleSheetVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lframework.xingyun.settle.vo.sheet.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApprovePassCustomerSettleSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private List ids; -} diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApproveRefuseCustomerSettleSheetVo.java b/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApproveRefuseCustomerSettleSheetVo.java deleted file mode 100644 index 4321730d51309cd459e905e5ade90e4af4705905..0000000000000000000000000000000000000000 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/sheet/customer/BatchApproveRefuseCustomerSettleSheetVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.lframework.xingyun.settle.vo.sheet.customer; - -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class BatchApproveRefuseCustomerSettleSheetVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "ID不能为空！") - private List ids; - - /** - * 拒绝理由 - */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; -} diff --git a/xingyun-template/pom.xml b/xingyun-sys/pom.xml similarity index 87% rename from xingyun-template/pom.xml rename to xingyun-sys/pom.xml index 3ff0b86c055fb9c106b3229a1c1639aa417ce141..a0533dffb67aa6c4a5a1833c22db3b1e7ab33a98 100644 --- a/xingyun-template/pom.xml +++ b/xingyun-sys/pom.xml @@ -9,14 +9,14 @@ 4.0.0 - xingyun-template + xingyun-sys - 【${project.artifactId}】此Module与业务无关，提供用户、角色、部门、岗位等基础接口 + 【${project.artifactId}】此Module与业务无关，提供用户、角色、部门等基础接口 com.lframework - xingyun-template-core + xingyun-core com.lframework diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/config/TemplateApiConfiguration.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java index 36e4702d1c25ec8d1fb1202eecd4d92a4b8c03c5..3eed7242b90b839ea4fe29ea2eeb0c6a7a7ea750 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GenCustomListSelectorBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomList; import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java similarity index 99% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java index 278ded871746a67099dc52d7e8fc60b4718b6523..4b6c2ea549ed32ce71d190ab5eec3581c3b79553 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/GetGenCustomListBo.java @@ -4,7 +4,7 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; import com.lframework.starter.web.bo.SuperBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.template.gen.entity.GenCustomList; import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; import com.lframework.xingyun.template.gen.entity.GenCustomListDetail; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java index 6958e996b6bc629799c8d016cdad324d19f30434..57e4f9c568529c30bd705d76a009f8367a891d2f 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/QueryGenCustomListBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomList; import com.lframework.xingyun.template.gen.entity.GenCustomListCategory; import com.lframework.xingyun.template.gen.service.GenCustomListCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GenCustomListCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GenCustomListCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GenCustomListCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GenCustomListCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GetGenCustomListCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GetGenCustomListCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GetGenCustomListCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/GetGenCustomListCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/QueryGenCustomListCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/QueryGenCustomListCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/QueryGenCustomListCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/list/category/QueryGenCustomListCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java index a04cd61a6d98ff0c011db3cc677bae1920e32712..2db767633bbefe3bcb233616058a607b17c3ec67 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GenCustomPageSelectorBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomPage; import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java similarity index 96% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java index eca5112195783fbf5966b01f915ab76b914138c4..ff9a06dfd0b30e4692d85faa2f7231b4b1c9164e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/GetGenCustomPageBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomPage; import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java index 6c586d6e4ab38e6d00a93719586806a9cf86007d..feeabd496968039845f6bfe2cc9d63050ef26de2 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/QueryGenCustomPageBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomPage; import com.lframework.xingyun.template.gen.entity.GenCustomPageCategory; import com.lframework.xingyun.template.gen.service.GenCustomPageCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GenCustomPageCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GenCustomPageCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GenCustomPageCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GenCustomPageCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GetGenCustomPageCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GetGenCustomPageCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GetGenCustomPageCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/GetGenCustomPageCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/QueryGenCustomPageCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/QueryGenCustomPageCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/QueryGenCustomPageCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/page/category/QueryGenCustomPageCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java index 51530f94f8ad24a0856ca5a398b480439b7adb21..b03e72b9125ccae37eed8565d3f9ddf3de724205 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GenCustomSelectorSelectorBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomSelector; import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java index 6fa75baeb5334b4b4abcdb475d0029dda3fb90ce..4222f65a4d67e8b13215bcbf12fd51e2227ceb0a 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/GetGenCustomSelectorBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; import com.lframework.xingyun.template.gen.service.GenCustomListService; import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java index 0bc1dd01312ed7bb98217deffffd818309aba2fb..a47b7d6ec0dc8e5cdb96b1cbe943f68c015bcb5a 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/QueryGenCustomSelectorBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenCustomSelector; import com.lframework.xingyun.template.gen.entity.GenCustomSelectorCategory; import com.lframework.xingyun.template.gen.service.GenCustomSelectorCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GenCustomSelectorCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GenCustomSelectorCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GenCustomSelectorCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GenCustomSelectorCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GetGenCustomSelectorCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GetGenCustomSelectorCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GetGenCustomSelectorCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/GetGenCustomSelectorCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/QueryGenCustomSelectorCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/QueryGenCustomSelectorCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/QueryGenCustomSelectorCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/custom/selector/category/QueryGenCustomSelectorCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/DataEntityGenerateBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/DataEntityGenerateBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/DataEntityGenerateBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/DataEntityGenerateBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java similarity index 98% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java index 023915b303fee6370a6363f2791ac7f45203aaee..ccc908ff999ec83af6ad7adccb8d5cd3fc72d2cd 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.service.GenCustomSelectorService; import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.service.system.SysDataDicService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailGenerateBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailGenerateBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailGenerateBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailGenerateBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntityDetailSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java index c86a2b5909cf14a24aafca33637caf8bfb077911..5f59c807dec27e73f4a5712be22557d2f9e8d99b 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GenDataEntitySelectorBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataEntity; import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java index 0bb34a8d33324f8fd18dc38b00200c8aac4eee4d..9dc2ff18915c46821f8923f18be7aa9355bdb717 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/GetDataEntityBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataEntityDetail; import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; import com.lframework.xingyun.template.gen.service.GenDataEntityDetailService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java index dced7f6814122fdd53c470dd200109186ca77f78..650e9e42f7a7723890662349b40327f7de684276 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/QueryDataEntityBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataEntity; import com.lframework.xingyun.template.gen.entity.GenDataEntityCategory; import com.lframework.xingyun.template.gen.service.GenDataEntityCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GenDataEntityCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GenDataEntityCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GenDataEntityCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GenDataEntityCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GetGenDataEntityCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GetGenDataEntityCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GetGenDataEntityCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/GetGenDataEntityCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/QueryGenDataEntityCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/QueryGenDataEntityCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/QueryGenDataEntityCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/entity/category/QueryGenDataEntityCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjColumnBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjColumnBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjColumnBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjColumnBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java index 537cfe619c598c806c1a128c29005dc912c75089..ddc1fd54ca51bb4cabfc1d7fd05afe7643194ae1 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjDetailBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataEntity; import com.lframework.xingyun.template.gen.entity.GenDataObjDetail; import com.lframework.xingyun.template.gen.service.GenDataEntityService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjQueryDetailBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjQueryDetailBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjQueryDetailBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjQueryDetailBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java index 1a5ea2f6f7883a7eec3be5ae265c30e1e74c37ae..df8048f435f2d00145948d68ae25bc463997372e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GenDataObjSelectorBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataObj; import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java similarity index 98% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java index 52989ca832d3a446825aa497c3b225a65b34e96a..8053218a19cf65825703189b64f1c97a4064a0b0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/GetGenDataObjBo.java @@ -12,7 +12,7 @@ import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; import com.lframework.xingyun.template.gen.service.GenDataObjDetailService; import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.stream.Collectors; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java index dd995c08a923a92dd1c20f89879f4579d3f1eb63..0d6b2f45777dd9dff27931bce465e3426fff61e7 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/QueryGenDataObjBo.java @@ -7,7 +7,7 @@ import com.lframework.xingyun.template.gen.entity.GenDataObj; import com.lframework.xingyun.template.gen.entity.GenDataObjCategory; import com.lframework.xingyun.template.gen.service.GenDataObjCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GenDataObjCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GenDataObjCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GenDataObjCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GenDataObjCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GetGenDataObjCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GetGenDataObjCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GetGenDataObjCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/GetGenDataObjCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/QueryGenDataObjCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/QueryGenDataObjCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/QueryGenDataObjCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/data/obj/category/QueryGenDataObjCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenCreateColumnConfigBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenCreateColumnConfigBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenCreateColumnConfigBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenCreateColumnConfigBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenDetailColumnConfigBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenDetailColumnConfigBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenDetailColumnConfigBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenDetailColumnConfigBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java index d0efaa2ecf17fdae4d792b783119825ad465bad3..365a86b0872ee5eb28cfe88640649a10ff499757 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenGenerateInfoBo.java @@ -4,7 +4,7 @@ import com.lframework.starter.common.utils.StringUtil; import com.lframework.xingyun.template.gen.dto.gen.GenGenerateInfoDto; import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import lombok.Data; @Data diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryColumnConfigBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryColumnConfigBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryColumnConfigBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryColumnConfigBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryParamsColumnConfigBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryParamsColumnConfigBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryParamsColumnConfigBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenQueryParamsColumnConfigBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenUpdateColumnConfigBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenUpdateColumnConfigBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenUpdateColumnConfigBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/gen/GenUpdateColumnConfigBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/simpledb/SimpleDBSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/simpledb/SimpleDBSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/bo/simpledb/SimpleDBSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/bo/simpledb/SimpleDBSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java similarity index 99% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java index 4621fc5c037b2342ba87f3ab95d2c32be6cafc39..c06a039d071d40c9e07f1071bca3dd0e6a867ca3 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomListBuilder.java @@ -40,7 +40,7 @@ import com.lframework.xingyun.template.gen.service.GenDataObjQueryDetailService; import com.lframework.xingyun.template.gen.service.GenDataObjService; import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.service.system.SysDataDicService; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import java.util.ArrayList; import java.util.List; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomPageBuilder.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomPageBuilder.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomPageBuilder.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomPageBuilder.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomSelectorBuilder.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomSelectorBuilder.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/CustomSelectorBuilder.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/CustomSelectorBuilder.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/DataEntityBuilder.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataEntityBuilder.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/DataEntityBuilder.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataEntityBuilder.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/DataObjectBuilder.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataObjectBuilder.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/builders/DataObjectBuilder.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/builders/DataObjectBuilder.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/CreateColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/CreateColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/CreateColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/CreateColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DataEntity.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntity.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DataEntity.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntity.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DataEntityColumn.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntityColumn.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DataEntityColumn.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DataEntityColumn.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DetailColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DetailColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/DetailColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/DetailColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/QueryColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/QueryColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/QueryParamsColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryParamsColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/QueryParamsColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/QueryParamsColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/Table.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/Table.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/Table.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/Table.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/TableColumn.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/TableColumn.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/TableColumn.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/TableColumn.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/UpdateColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/UpdateColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/UpdateColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/UpdateColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/list/CustomListConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/list/CustomListConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/list/CustomListConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/list/CustomListConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/page/CustomPageConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/page/CustomPageConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/page/CustomPageConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/page/CustomPageConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/selector/CustomSelectorConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/selector/CustomSelectorConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/custom/selector/CustomSelectorConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/custom/selector/CustomSelectorConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryObj.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryObj.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryObj.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryObj.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryParamObj.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryParamObj.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryParamObj.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/data/obj/DataObjectQueryParamObj.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java similarity index 91% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java index df0f5a06969e849ee259e709647b1f37714e5712..7bef36e5eacf95e458fb0765d107fd04fd74a566 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomAuthorizationInterceptor.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.template.gen.components.magic; import com.lframework.starter.common.utils.ArrayUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.security.CheckPermissionHandler; import com.lframework.starter.web.components.security.PermissionCalcType; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomJsonValueProvider.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomJsonValueProvider.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomJsonValueProvider.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomJsonValueProvider.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java similarity index 77% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java index a7333cdadd8af2bd42ce3c6c1a3e6e7003997c2a..1a1044305636c80c726d56c057d7c573224f1b16 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomMagicFunction.java @@ -1,8 +1,8 @@ package com.lframework.xingyun.template.gen.components.magic; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.tenant.TenantContextHolder; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import org.springframework.stereotype.Component; import org.ssssssss.magicapi.core.config.MagicFunction; import org.ssssssss.script.annotation.Comment; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomSqlCache.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomSqlCache.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomSqlCache.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/components/magic/MagicCustomSqlCache.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/config/MagicCustomConfiguration.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/config/MagicCustomConfiguration.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/config/MagicCustomConfiguration.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/config/MagicCustomConfiguration.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/constants/GenStringPool.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/constants/GenStringPool.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/constants/GenStringPool.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/constants/GenStringPool.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java similarity index 80% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java index bb0fcb85097fe75ad3c307e770a8b7263d8bcffd..903a493046e53bbddbac1ae42175d3e65262836a 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomListController.java @@ -102,38 +102,26 @@ public class GenCustomListController extends DefaultBaseController { return InvokeResultBuilder.success(); } - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("启用") + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genCustomListService.batchDelete(ids); + genCustomListService.enable(id); - genCustomListService.cleanCacheByKeys(ids); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("批量启用") - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { - - genCustomListService.batchEnable(ids); - - genCustomListService.cleanCacheByKeys(ids); + genCustomListService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } - @ApiOperation("批量停用") - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("停用") + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genCustomListService.batchUnable(ids); + genCustomListService.unable(id); - genCustomListService.cleanCacheByKeys(ids); + genCustomListService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java index db2d087c5581940e4622e6979af5f4e8a644c146..005f1cde526f71c7296cb7692d628abd3fc9f68c 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomPageController.java @@ -1,26 +1,24 @@ package com.lframework.xingyun.template.gen.controller; import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.template.gen.bo.custom.page.GetGenCustomPageBo; import com.lframework.xingyun.template.gen.bo.custom.page.QueryGenCustomPageBo; +import com.lframework.xingyun.template.gen.entity.GenCustomPage; import com.lframework.xingyun.template.gen.service.GenCustomPageService; import com.lframework.xingyun.template.gen.vo.custom.page.CreateGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.QueryGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.UpdateGenCustomPageVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -99,16 +97,4 @@ public class GenCustomPageController extends DefaultBaseController { return InvokeResultBuilder.success(); } - - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { - - genCustomPageService.batchDelete(ids); - - genCustomPageService.cleanCacheByKeys(ids); - - return InvokeResultBuilder.success(); - } } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java similarity index 80% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java index 88da8f871d58d14123c13329774c97d2d00a680a..840eb843d0e4680cb8806f2bd4ce78f2085a1b1d 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenCustomSelectorController.java @@ -103,38 +103,26 @@ public class GenCustomSelectorController extends DefaultBaseController { return InvokeResultBuilder.success(); } - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("启用") + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genCustomSelectorService.batchDelete(ids); + genCustomSelectorService.enable(id); - genCustomSelectorService.cleanCacheByKeys(ids); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("批量启用") - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { - - genCustomSelectorService.batchEnable(ids); - - genCustomSelectorService.cleanCacheByKeys(ids); + genCustomSelectorService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } - @ApiOperation("批量停用") - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("停用") + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genCustomSelectorService.batchUnable(ids); + genCustomSelectorService.unable(id); - genCustomSelectorService.cleanCacheByKeys(ids); + genCustomSelectorService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java index e4b66ef2ac6b062553af692d17b0a56317616b00..5bbfd9019f9909e0fc308d4d26fe74b0dc4bc7ef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataEntityController.java @@ -33,7 +33,7 @@ import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.ResponseUtil; import io.swagger.annotations.Api; @@ -177,44 +177,26 @@ public class GenDataEntityController extends DefaultBaseController { return InvokeResultBuilder.success(); } - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("启用") + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genDataEntityService.batchDelete(ids); + genDataEntityService.enable(id); - for (String id : ids) { - this.evictRelaCache(id); - } - - return InvokeResultBuilder.success(); - } - - @ApiOperation("批量启用") - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { - - genDataEntityService.batchEnable(ids); - - for (String id : ids) { - this.evictRelaCache(id); - } + this.evictRelaCache(id); return InvokeResultBuilder.success(); } - @ApiOperation("批量停用") - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("停用") + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genDataEntityService.batchUnable(ids); + genDataEntityService.unable(id); - for (String id : ids) { - this.evictRelaCache(id); - } + this.evictRelaCache(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java index f24804bc3f1675c1e5d59deb2f5bc393312b32b6..1fd5d17901f07fe1b36c294713e4d59b5ecc87ef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenDataObjController.java @@ -221,38 +221,26 @@ public class GenDataObjController extends DefaultBaseController { return InvokeResultBuilder.success(); } - @ApiOperation("批量删除") - @DeleteMapping("/batch") - public InvokeResult batchDelete( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("启用") + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genDataObjService.batchDelete(ids); + genDataObjService.enable(id); - genDataObjService.cleanCacheByKeys(ids); - - return InvokeResultBuilder.success(); - } - - @ApiOperation("批量启用") - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { - - genDataObjService.batchEnable(ids); - - genDataObjService.cleanCacheByKeys(ids); + genDataObjService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } - @ApiOperation("批量停用") - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "ID", required = true) @RequestBody @NotEmpty(message = "ID不能为空！") List ids) { + @ApiOperation("停用") + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "ID", required = true) @NotEmpty(message = "ID不能为空！") String id) { - genDataObjService.batchUnable(ids); + genDataObjService.unable(id); - genDataObjService.cleanCacheByKeys(ids); + genDataObjService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenSelectorController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenSelectorController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/controller/GenSelectorController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/controller/GenSelectorController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenMysqlDataTypeConverter.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenMysqlDataTypeConverter.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenMysqlDataTypeConverter.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenMysqlDataTypeConverter.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenStringConverter.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenStringConverter.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenStringConverter.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenStringConverter.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenViewTypeConverter.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenViewTypeConverter.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/converters/GenViewTypeConverter.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/converters/GenViewTypeConverter.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/directives/FormatDirective.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/directives/FormatDirective.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/directives/FormatDirective.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/directives/FormatDirective.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/DataEntityGenerateDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/DataEntityGenerateDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/DataEntityGenerateDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/DataEntityGenerateDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/GenDataEntityDetailDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/GenDataEntityDetailDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/GenDataEntityDetailDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/data/entity/GenDataEntityDetailDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenCreateColumnConfigDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenCreateColumnConfigDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenCreateColumnConfigDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenCreateColumnConfigDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenDetailColumnConfigDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenDetailColumnConfigDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenDetailColumnConfigDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenDetailColumnConfigDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenGenerateInfoDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenGenerateInfoDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenGenerateInfoDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenGenerateInfoDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryColumnConfigDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryColumnConfigDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryColumnConfigDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryColumnConfigDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryParamsColumnConfigDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryParamsColumnConfigDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryParamsColumnConfigDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenQueryParamsColumnConfigDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenUpdateColumnConfigDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenUpdateColumnConfigDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenUpdateColumnConfigDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/gen/GenUpdateColumnConfigDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/generate/GenerateDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/generate/GenerateDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/generate/GenerateDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/generate/GenerateDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableColumnDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableColumnDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableColumnDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableColumnDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/OriSimpleTableDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleDBDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleDBDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleDBDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleDBDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleTableDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleTableDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleTableDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/dto/simpledb/SimpleTableDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCreateColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCreateColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCreateColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCreateColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomList.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomList.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomList.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomList.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListDetail.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListDetail.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListDetail.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListHandleColumn.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListHandleColumn.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListHandleColumn.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListHandleColumn.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListQueryParams.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListQueryParams.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListQueryParams.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListQueryParams.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListToolbar.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListToolbar.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListToolbar.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomListToolbar.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPage.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPage.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPage.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPage.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPageCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPageCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPageCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomPageCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelector.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelector.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelector.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelector.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelectorCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelectorCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelectorCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenCustomSelectorCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntity.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntity.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntity.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntity.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityDetail.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityDetail.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataEntityDetail.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObj.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObj.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObj.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObj.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjDetail.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjDetail.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjDetail.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjQueryDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjQueryDetail.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjQueryDetail.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDataObjQueryDetail.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDetailColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDetailColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenDetailColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenDetailColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenGenerateInfo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenGenerateInfo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenGenerateInfo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenGenerateInfo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryParamsColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryParamsColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryParamsColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenQueryParamsColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTable.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTable.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTable.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTable.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTableColumn.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTableColumn.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTableColumn.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenSimpleTableColumn.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenUpdateColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenUpdateColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenUpdateColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenUpdateColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateColumnConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateColumnConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateColumnConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateColumnConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateConfig.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateConfig.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateConfig.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/entity/GenerateConfig.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenConvertType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenConvertType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenConvertType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenConvertType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnViewType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnViewType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnViewType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListBtnViewType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListDetailType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListDetailType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListDetailType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListDetailType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenCustomListType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java similarity index 62% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java index 2172a7db73992fb1e13a2c81b63718d649683a58..ec3fa812a47fcc53ee97fa3b63980bd78836c7bc 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java @@ -9,9 +9,12 @@ import java.time.LocalTime; public enum GenDataType implements BaseEnum { - STRING(0, String.class, "String"), INTEGER(1, Integer.class, "Integer"), SHORT(2, Short.class, "Short"), LONG(3, Long.class, "Long"), DOUBLE(4, - Double.class, "Double"), LOCAL_DATE(5, LocalDate.class, "LocalDate"), LOCAL_DATE_TIME(6, LocalDateTime.class, "LocalDateTime"), LOCAL_TIME(7, - LocalTime.class, "LocalTime"), BOOLEAN(8, Boolean.class, "Boolean"), BIG_DECIMAL(9, BigDecimal.class, "BigDecimal"), + STRING(0, String.class, "String", "string"), INTEGER(1, Integer.class, "Integer", + "number"), SHORT(2, Short.class, "Short", "number"), LONG(3, Long.class, "Long", "number"), DOUBLE(4, + Double.class, "Double", "number"), LOCAL_DATE(5, LocalDate.class, "LocalDate", "string"), LOCAL_DATE_TIME(6, + LocalDateTime.class, "LocalDateTime", "string"), LOCAL_TIME(7, + LocalTime.class, "LocalTime", "string"), BOOLEAN(8, Boolean.class, "Boolean", "boolean"), BIG_DECIMAL(9, + BigDecimal.class, "BigDecimal", "number"), ; @EnumValue @@ -21,11 +24,14 @@ public enum GenDataType implements BaseEnum { private final String desc; - GenDataType(Integer code, Class clazz, String desc) { + private final String frontDesc; + + GenDataType(Integer code, Class clazz, String desc, String frontDesc) { this.code = code; this.clazz = clazz; this.desc = desc; + this.frontDesc = frontDesc; } /** @@ -73,4 +79,8 @@ public enum GenDataType implements BaseEnum { public Class getClazz() { return clazz; } + + public String getFrontDesc() { + return frontDesc; + } } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenKeyType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenKeyType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenKeyType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenKeyType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenMySqlDataType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenMySqlDataType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenMySqlDataType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenMySqlDataType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenOrderType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenOrderType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenOrderType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenOrderType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryWidthType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryWidthType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryWidthType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenQueryWidthType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaMode.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaMode.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaMode.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaMode.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenRelaType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenStatus.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenStatus.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenStatus.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenStatus.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenTemplateType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenTemplateType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenTemplateType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenTemplateType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenViewType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenViewType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenViewType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/enums/GenViewType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/CustomListDeleteEvent.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/CustomListDeleteEvent.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/CustomListDeleteEvent.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/CustomListDeleteEvent.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDeleteEvent.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDeleteEvent.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDeleteEvent.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDeleteEvent.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDetailDeleteEvent.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDetailDeleteEvent.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDetailDeleteEvent.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataEntityDetailDeleteEvent.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataObjDeleteEvent.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjDeleteEvent.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataObjDeleteEvent.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjDeleteEvent.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataObjQueryDetailDeleteEvent.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjQueryDetailDeleteEvent.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/events/DataObjQueryDetailDeleteEvent.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/events/DataObjQueryDetailDeleteEvent.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java similarity index 92% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java index 1dcbef44e59ace0320e28777d7639b0fc08a28ab..3226fa69eadd0bf20de621c49eee488bfaae9a7f 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java @@ -12,7 +12,7 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.components.validation.IsNumberPrecision; import com.lframework.starter.web.components.validation.Pattern; @@ -33,9 +33,9 @@ import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.vo.BaseVo; import com.lframework.starter.web.vo.PageVo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.gen.builders.DataEntityBuilder; import com.lframework.xingyun.template.gen.components.DataEntity; import com.lframework.xingyun.template.gen.components.DataEntityColumn; @@ -161,6 +161,11 @@ public class Generator { GenerateDto addVue = this.generateAddVue(); GenerateDto modifyVue = this.generateModifyVue(); GenerateDto detailVue = this.generateDetailVue(); + GenerateDto createVoVue = this.generateCreateVoVue(); + GenerateDto queryVoVue = this.generateQueryVoVue(); + GenerateDto updateVoVue = this.generateUpdateVoVue(); + GenerateDto queryBoVue = this.generateQueryBoVue(); + GenerateDto getBoVue = this.generateGetBoVue(); results.add(apiJs); results.add(indexVue); @@ -173,6 +178,21 @@ public class Generator { if (detailVue != null) { results.add(detailVue); } + if (createVoVue != null) { + results.add(createVoVue); + } + if (queryVoVue != null) { + results.add(queryVoVue); + } + if (updateVoVue != null) { + results.add(updateVoVue); + } + if (queryBoVue != null) { + results.add(queryBoVue); + } + if (getBoVue != null) { + results.add(getBoVue); + } // sql GenerateDto sql = this.generateSql(); @@ -273,7 +293,7 @@ public class Generator { + File.separator + template.getPackageName().replaceAll("\\.", "\\" + File.separator) + File.separator + "service" + File.separator + template.getModuleName(), - "I" + template.getClassName() + "Service.java", content); + template.getClassName() + "Service.java", content); } /** @@ -421,12 +441,12 @@ public class Generator { ControllerTemplate template = this.getControllerTemplate(); - String content = this.generate("api.js.ftl", template); + String content = this.generate("api.ts.ftl", template); return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "api" + File.separator + "modules" - + File.separator - + template.getModuleName(), template.getBizName() + ".js", content); + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName(), "index.ts", + content); } /** @@ -631,6 +651,115 @@ public class Generator { return entityTemplate; } + /** + * 生成CreateVo.ts代码 + * + * @return + */ + public GenerateDto generateCreateVoVue() { + + CreateTemplate template = this.getCreateTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("createvo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "create" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成QueryVo.ts代码 + * + * @return + */ + public GenerateDto generateQueryVoVue() { + + QueryParamsTemplate template = this.getQueryParamsTemplate(); + if (template == null) { + return null; + } + + String content = this.generate("queryvo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "query" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成UpdateVo.ts代码 + * + * @return + */ + public GenerateDto generateUpdateVoVue() { + + UpdateTemplate template = this.getUpdateTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("updatevo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "update" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成QueryBo.ts代码 + * + * @return + */ + public GenerateDto generateQueryBoVue() { + + QueryTemplate template = this.getQueryTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("querybo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "query" + template.getClassName() + "Bo.ts", + content); + } + + /** + * 生成GetBo.ts代码 + * + * @return + */ + public GenerateDto generateGetBoVue() { + + DetailTemplate template = this.getDetailTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("getbo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "get" + template.getClassName() + "Bo.ts", + content); + } + /** * Mapper.java模板数据 * @@ -800,12 +929,14 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); columnObj.setEnumCodeType(column.getDataType().getDesc()); importPackages.add(column.getEnumBack()); importPackages.add(IsEnum.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setViewType(column.getViewType().getCode()); } // 以下类型需要单独引包 @@ -880,7 +1011,6 @@ public class Generator { importPackages.add(TypeMismatch.class.getName()); importPackages.add(BaseVo.class.getName()); - List columns = new ArrayList<>(); for (DataEntityColumn column : targetColumns) { CreateTemplate.Column columnObj = new CreateTemplate.Column(); @@ -891,12 +1021,14 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); columnObj.setViewType(column.getViewType().getCode()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); } if (column.getViewType() == GenViewType.DATE_RANGE) { if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { @@ -1036,10 +1168,12 @@ public class Generator { column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); columnObj.setViewType(column.getViewType().getCode()); + columnObj.setFrontDataType("number"); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setViewType(column.getViewType().getCode()); } if (column.getViewType() == GenViewType.DATE_RANGE) { @@ -1135,6 +1269,7 @@ public class Generator { UpdateTemplate.Key key = new UpdateTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); @@ -1184,11 +1319,13 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setIsNumberType(GenDataType.isNumberType(column.getDataType())); columnObj.setViewType(column.getViewType().getCode()); columnObj.setHasAvailableTag( @@ -1241,6 +1378,7 @@ public class Generator { QueryTemplate.Key key = new QueryTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); @@ -1286,10 +1424,12 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setHasAvailableTag( column.getViewType() == GenViewType.SELECT && column.getDataType() == GenDataType.BOOLEAN @@ -1342,6 +1482,7 @@ public class Generator { DetailTemplate.Key key = new DetailTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ControllerTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ControllerTemplate.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ControllerTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ControllerTemplate.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java index 0d16e15db6743470526a584217ca371d96edf5f9..6409297e23ef4cc7e2e5c30890fa81fde842eeb7 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java @@ -132,6 +132,11 @@ public class CreateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java index 76646cf075690f38bbf32a95f90d422982e09b36..dfd38ca090f1151a903e4a924ed004d53cee9898 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java @@ -78,6 +78,11 @@ public class DetailTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -112,6 +117,11 @@ public class DetailTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/EntityTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/EntityTemplate.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/EntityTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/EntityTemplate.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/MapperTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/MapperTemplate.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/MapperTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/MapperTemplate.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java similarity index 96% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java index f7886261110ae20172411158f161a19edd547bac..51a5443409fdbdbee08e87f68a6cce376e0ef545 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java @@ -73,6 +73,11 @@ public class QueryParamsTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java index 46db2ed99c35a84ac1330b9d696675f0722f3efd..0ce6dc486599b8da4c0fcb51e4295879b425dc71 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java @@ -68,6 +68,11 @@ public class QueryTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -102,6 +107,11 @@ public class QueryTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ServiceTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ServiceTemplate.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ServiceTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/ServiceTemplate.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/SqlTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/SqlTemplate.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/SqlTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/SqlTemplate.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java index 479233508b8367172c796aadd6222b1b5852640f..938b4c46fc590d028ad85ce1775ed0d867301eef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java @@ -63,6 +63,11 @@ public class UpdateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -122,6 +127,11 @@ public class UpdateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCreateColumnConfigServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCreateColumnConfigServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCreateColumnConfigServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCreateColumnConfigServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListDetailServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListDetailServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListDetailServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListHandleColumnServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListHandleColumnServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListHandleColumnServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListHandleColumnServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListQueryParamsServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListQueryParamsServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListQueryParamsServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListQueryParamsServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java similarity index 96% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java index 8a9ff4f0a69a72997851f1eaf70fd688c246aa34..497c32b2a41c1ee253c9f7a42854e9b0fc0fa8c2 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListServiceImpl.java @@ -41,7 +41,7 @@ import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.JsonUtil; @@ -467,37 +467,19 @@ public class GenCustomListServiceImpl extends @Transactional(rollbackFor = Exception.class) @Override - public void batchDelete(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } - - for (String id : ids) { - this.delete(id); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomList.class) - .set(GenCustomList::getAvailable, Boolean.TRUE).in(GenCustomList::getId, ids); + .set(GenCustomList::getAvailable, Boolean.TRUE).eq(GenCustomList::getId, id); getBaseMapper().update(wrapper); } @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomList.class) - .set(GenCustomList::getAvailable, Boolean.FALSE).in(GenCustomList::getId, ids); + .set(GenCustomList::getAvailable, Boolean.FALSE).eq(GenCustomList::getId, id); getBaseMapper().update(wrapper); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListToolbarServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListToolbarServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListToolbarServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomListToolbarServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java index b735f9e652294bb422e9f7defa3dcd0f160e4a56..eceaef4937b939e6a5785516239e4fe4d173a4d7 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomPageServiceImpl.java @@ -4,20 +4,19 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.template.gen.components.custom.page.CustomPageConfig; +import com.lframework.xingyun.template.gen.entity.GenCustomPage; +import com.lframework.xingyun.template.gen.mappers.GenCustomPageMapper; import com.lframework.xingyun.template.gen.service.GenCustomPageService; import com.lframework.xingyun.template.gen.vo.custom.page.CreateGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.GenCustomPageSelectorVo; import com.lframework.xingyun.template.gen.vo.custom.page.QueryGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.UpdateGenCustomPageVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.xingyun.template.gen.mappers.GenCustomPageMapper; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; import java.io.Serializable; import java.util.List; import org.springframework.cache.annotation.CacheEvict; @@ -108,18 +107,6 @@ public class GenCustomPageServiceImpl extends this.removeById(id); } - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDelete(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } - - for (Integer id : ids) { - this.delete(id); - } - } - @CacheEvict(value = {GenCustomPage.CACHE_NAME, CustomPageConfig.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") @Override diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java similarity index 88% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java index d7f0c7464188c3529ff125dbd2a4110c3d3f85e1..e8569b48952a159aae53ebeef1cc872708323c8e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenCustomSelectorServiceImpl.java @@ -6,8 +6,12 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.template.gen.components.custom.selector.CustomSelectorConfig; import com.lframework.xingyun.template.gen.entity.GenCustomSelector; import com.lframework.xingyun.template.gen.mappers.GenCustomSelectorMapper; @@ -16,11 +20,6 @@ import com.lframework.xingyun.template.gen.vo.custom.selector.CreateGenCustomSel import com.lframework.xingyun.template.gen.vo.custom.selector.GenCustomSelectorSelectorVo; import com.lframework.xingyun.template.gen.vo.custom.selector.QueryGenCustomSelectorVo; import com.lframework.xingyun.template.gen.vo.custom.selector.UpdateGenCustomSelectorVo; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; import java.io.Serializable; import java.util.List; import org.springframework.cache.annotation.CacheEvict; @@ -137,37 +136,19 @@ public class GenCustomSelectorServiceImpl extends @Transactional(rollbackFor = Exception.class) @Override - public void batchDelete(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } - - for (String id : ids) { - this.delete(id); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomSelector.class) - .set(GenCustomSelector::getAvailable, Boolean.TRUE).in(GenCustomSelector::getId, ids); + .set(GenCustomSelector::getAvailable, Boolean.TRUE).eq(GenCustomSelector::getId, id); getBaseMapper().update(wrapper); } @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenCustomSelector.class) - .set(GenCustomSelector::getAvailable, Boolean.FALSE).in(GenCustomSelector::getId, ids); + .set(GenCustomSelector::getAvailable, Boolean.FALSE).eq(GenCustomSelector::getId, id); getBaseMapper().update(wrapper); } @@ -176,7 +157,8 @@ public class GenCustomSelectorServiceImpl extends return getBaseMapper().getRelaGenCustomListIds(customListId); } - @CacheEvict(value = {GenCustomSelector.CACHE_NAME, CustomSelectorConfig.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") + @CacheEvict(value = {GenCustomSelector.CACHE_NAME, + CustomSelectorConfig.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") @Override public void cleanCacheByKey(Serializable key) { super.cleanCacheByKey(key); diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityDetailServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityDetailServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityDetailServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java index 2d1f8ce0a190ec33840defabd341b6dc3931c4bc..c531c070049555a678e26edd2434ecca16ac58c1 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataEntityServiceImpl.java @@ -52,7 +52,7 @@ import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import java.util.ArrayList; @@ -294,38 +294,19 @@ public class GenDataEntityServiceImpl extends @Transactional(rollbackFor = Exception.class) @Override - public void batchDelete(@NonNull List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - for (String id : ids) { - this.delete(id); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .set(GenDataEntity::getAvailable, Boolean.TRUE).in(GenDataEntity::getId, ids); + .set(GenDataEntity::getAvailable, Boolean.TRUE).eq(GenDataEntity::getId, id); getBaseMapper().update(wrapper); } @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenDataEntity.class) - .set(GenDataEntity::getAvailable, Boolean.FALSE).in(GenDataEntity::getId, ids); + .set(GenDataEntity::getAvailable, Boolean.FALSE).eq(GenDataEntity::getId, id); getBaseMapper().update(wrapper); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjDetailServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjDetailServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjDetailServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjQueryDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjQueryDetailServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjQueryDetailServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjQueryDetailServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java index 9ebf8dec7a98c1cc40dee6c74fd2396df3213766..4f13ca1743f3b12f0ecde8391e7f6e83aee5402b 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDataObjServiceImpl.java @@ -33,7 +33,7 @@ import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import java.io.Serializable; @@ -272,38 +272,19 @@ public class GenDataObjServiceImpl extends @Transactional(rollbackFor = Exception.class) @Override - public void batchDelete(@NonNull List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - for (String id : ids) { - this.delete(id); - } - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenDataObj.class) - .set(GenDataObj::getAvailable, Boolean.TRUE).in(GenDataObj::getId, ids); + .set(GenDataObj::getAvailable, Boolean.TRUE).eq(GenDataObj::getId, id); getBaseMapper().update(wrapper); } @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(List ids) { - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { Wrapper wrapper = Wrappers.lambdaUpdate(GenDataObj.class) - .set(GenDataObj::getAvailable, Boolean.FALSE).in(GenDataObj::getId, ids); + .set(GenDataObj::getAvailable, Boolean.FALSE).eq(GenDataObj::getId, id); getBaseMapper().update(wrapper); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDetailColumnConfigServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDetailColumnConfigServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenDetailColumnConfigServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenDetailColumnConfigServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryColumnConfigServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryColumnConfigServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryColumnConfigServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryColumnConfigServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryParamsColumnConfigServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryParamsColumnConfigServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryParamsColumnConfigServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenQueryParamsColumnConfigServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenUpdateColumnConfigServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenUpdateColumnConfigServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenUpdateColumnConfigServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenUpdateColumnConfigServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenerateInfoServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenerateInfoServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/GenerateInfoServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/GenerateInfoServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleDBServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleDBServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleDBServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleDBServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleTableColumnServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleTableColumnServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleTableColumnServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/impl/SimpleTableColumnServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/CreateColumnConfigListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/CreateColumnConfigListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/CreateColumnConfigListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/CreateColumnConfigListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/DetailColumnConfigListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/DetailColumnConfigListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/DetailColumnConfigListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/DetailColumnConfigListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomListListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomListListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomListListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomListListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomSelectorListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomSelectorListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomSelectorListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenCustomSelectorListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenDataObjListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenDataObjListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenDataObjListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenDataObjListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java index 02961fb481b4bb79bc224483279bbc7f58e53ce2..82fc0149a4e6a08fae0915d6c5c86acdf3c372a3 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenTenantListener.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.gen.listeners; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties; import com.lframework.starter.web.utils.DataSourceUtil; -import com.lframework.starter.web.common.event.ReloadTenantEvent; +import com.lframework.starter.web.event.ReloadTenantEvent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenerateInfoListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenerateInfoListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/GenerateInfoListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/GenerateInfoListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryColumnConfigListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryColumnConfigListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryColumnConfigListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryColumnConfigListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryParamsColumnConfigListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryParamsColumnConfigListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryParamsColumnConfigListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/QueryParamsColumnConfigListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/UpdateColumnConfigListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/UpdateColumnConfigListener.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/listeners/UpdateColumnConfigListener.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/listeners/UpdateColumnConfigListener.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/DBMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/DBMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/DBMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/DBMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCreateColumnConfigMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCreateColumnConfigMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCreateColumnConfigMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCreateColumnConfigMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListDetailMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListDetailMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListDetailMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListHandleColumnMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListHandleColumnMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListHandleColumnMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListHandleColumnMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListQueryParamsMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListQueryParamsMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListQueryParamsMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListQueryParamsMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListToolbarMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListToolbarMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListToolbarMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomListToolbarMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomPageMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenCustomSelectorMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityDetailMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityDetailMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityDetailMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataEntityMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjDetailMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjDetailMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjDetailMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjQueryDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjQueryDetailMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjQueryDetailMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDataObjQueryDetailMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDetailColumnConfigMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDetailColumnConfigMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDetailColumnConfigMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenDetailColumnConfigMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenGenerateInfoMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenGenerateInfoMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenGenerateInfoMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenGenerateInfoMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryColumnConfigMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryColumnConfigMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryColumnConfigMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryColumnConfigMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryParamsColumnConfigMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryParamsColumnConfigMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryParamsColumnConfigMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenQueryParamsColumnConfigMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableColumnMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableColumnMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableColumnMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableColumnMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenSimpleTableMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenUpdateColumnConfigMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenUpdateColumnConfigMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/GenUpdateColumnConfigMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/GenUpdateColumnConfigMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/SimpleDBMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/SimpleDBMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/mappers/SimpleDBMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/mappers/SimpleDBMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCreateColumnConfigService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCreateColumnConfigService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCreateColumnConfigService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCreateColumnConfigService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListDetailService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListDetailService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListDetailService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListHandleColumnService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListHandleColumnService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListHandleColumnService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListHandleColumnService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListQueryParamsService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListQueryParamsService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListQueryParamsService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListQueryParamsService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java index 1a9ccab3ff5bae505e604e12b410d37ae33878fe..be0d2a094d9a3ca6610fd32cbe8cc77b1262213c 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListService.java @@ -70,24 +70,18 @@ public interface GenCustomListService extends BaseMpService { void delete(String id); /** - * 批量删除 - * @param ids - */ - void batchDelete(List ids); - - /** - * 批量启用 + * 启用 * - * @param ids + * @param id */ - void batchEnable(List ids); + void enable(String id); /** - * 批量停用 + * 停用 * - * @param ids + * @param id */ - void batchUnable(List ids); + void unable(String id); /** * 查询所有关联了数据对象的自定义列表ID diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListToolbarService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListToolbarService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListToolbarService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomListToolbarService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java index 7a6ac1f31ad478279f027ba1c494bcaa4ef0a843..950d2ccb64ec50c6d41c446a050f8132ef46b44c 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomPageService.java @@ -1,12 +1,12 @@ package com.lframework.xingyun.template.gen.service; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.gen.entity.GenCustomPage; import com.lframework.xingyun.template.gen.vo.custom.page.CreateGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.GenCustomPageSelectorVo; import com.lframework.xingyun.template.gen.vo.custom.page.QueryGenCustomPageVo; import com.lframework.xingyun.template.gen.vo.custom.page.UpdateGenCustomPageVo; -import com.lframework.xingyun.template.gen.entity.GenCustomPage; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; import java.util.List; public interface GenCustomPageService extends BaseMpService { @@ -70,11 +70,4 @@ public interface GenCustomPageService extends BaseMpService { * @param id */ void delete(Integer id); - - /** - * 批量删除 - * - * @param ids - */ - void batchDelete(List ids); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java similarity index 88% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java index 88f51858e572f7de7d773a509c6791abd27bc0db..d8f94f5f1ff85429d2ac3cd05e5f62290d724fe0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenCustomSelectorService.java @@ -72,25 +72,18 @@ public interface GenCustomSelectorService extends BaseMpService ids); - - /** - * 批量启用 - * - * @param ids + * @param id */ - void batchEnable(List ids); + void enable(String id); /** - * 批量停用 + * 停用 * - * @param ids + * @param id */ - void batchUnable(List ids); + void unable(String id); /** * 查询所有关联了自定义列表的自定义选择器ID diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityDetailService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityDetailService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityDetailService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java index 6ed37be37ec5ff8c9b656033557ed3a5d7eb40ea..d236ecbbd0c3c725e6f2da4450f8d77b2f1b5a53 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataEntityService.java @@ -73,25 +73,18 @@ public interface GenDataEntityService extends BaseMpService { void delete(String id); /** - * 根据ID批量删除 + * 启用 * - * @param ids - */ - void batchDelete(List ids); - - /** - * 批量启用 - * - * @param ids + * @param id */ - void batchEnable(List ids); + void enable(String id); /** - * 批量停用 + * 停用 * - * @param ids + * @param id */ - void batchUnable(List ids); + void unable(String id); /** * 根据ID查询 diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjDetailService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjDetailService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjDetailService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjQueryDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjQueryDetailService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjQueryDetailService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjQueryDetailService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java index 6c4d45540f245435c019b3aff3a5f3f402cd801e..dbdba994e783e013b9173425050bf2d87f442ac3 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDataObjService.java @@ -70,25 +70,18 @@ public interface GenDataObjService extends BaseMpService { void delete(String id); /** - * 根据ID批量删除 + * 启用 * - * @param ids - */ - void batchDelete(List ids); - - /** - * 批量启用 - * - * @param ids + * @param id */ - void batchEnable(List ids); + void enable(String id); /** - * 批量停用 + * 停用 * - * @param ids + * @param id */ - void batchUnable(List ids); + void unable(String id); /** * 查询所有关联了数据实体的数据对象ID diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDetailColumnConfigService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDetailColumnConfigService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenDetailColumnConfigService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenDetailColumnConfigService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryColumnConfigService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryColumnConfigService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryColumnConfigService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryColumnConfigService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryParamsColumnConfigService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryParamsColumnConfigService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryParamsColumnConfigService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenQueryParamsColumnConfigService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenUpdateColumnConfigService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenUpdateColumnConfigService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenUpdateColumnConfigService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenUpdateColumnConfigService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenerateInfoService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenerateInfoService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/GenerateInfoService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/GenerateInfoService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/SimpleDBService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleDBService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/SimpleDBService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleDBService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/SimpleTableColumnService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleTableColumnService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/service/SimpleTableColumnService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/service/SimpleTableColumnService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/CreateGenCustomListVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/CreateGenCustomListVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/CreateGenCustomListVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/CreateGenCustomListVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListDetailVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListDetailVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListDetailVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListHandleColumnVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListHandleColumnVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListHandleColumnVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListHandleColumnVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListQueryParamsVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListQueryParamsVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListQueryParamsVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListQueryParamsVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListToolbarVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListToolbarVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListToolbarVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/GenCustomListToolbarVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/QueryGenCustomListVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/QueryGenCustomListVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/QueryGenCustomListVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/QueryGenCustomListVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/UpdateGenCustomListVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/UpdateGenCustomListVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/UpdateGenCustomListVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/UpdateGenCustomListVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/CreateGenCustomListCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/CreateGenCustomListCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/CreateGenCustomListCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/CreateGenCustomListCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/GenCustomListCategorySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/GenCustomListCategorySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/GenCustomListCategorySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/GenCustomListCategorySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/UpdateGenCustomListCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/UpdateGenCustomListCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/UpdateGenCustomListCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/list/category/UpdateGenCustomListCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/CreateGenCustomPageVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/CreateGenCustomPageVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/CreateGenCustomPageVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/CreateGenCustomPageVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/GenCustomPageSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/QueryGenCustomPageVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/QueryGenCustomPageVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/QueryGenCustomPageVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/QueryGenCustomPageVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/UpdateGenCustomPageVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/UpdateGenCustomPageVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/UpdateGenCustomPageVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/UpdateGenCustomPageVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/CreateGenCustomPageCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/CreateGenCustomPageCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/CreateGenCustomPageCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/CreateGenCustomPageCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/UpdateGenCustomPageCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/UpdateGenCustomPageCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/UpdateGenCustomPageCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/page/category/UpdateGenCustomPageCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/CreateGenCustomSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/CreateGenCustomSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/CreateGenCustomSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/CreateGenCustomSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/GenCustomSelectorSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/GenCustomSelectorSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/GenCustomSelectorSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/GenCustomSelectorSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/QueryGenCustomSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/QueryGenCustomSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/QueryGenCustomSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/QueryGenCustomSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/UpdateGenCustomSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/UpdateGenCustomSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/UpdateGenCustomSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/UpdateGenCustomSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/CreateGenCustomSelectorCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/CreateGenCustomSelectorCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/CreateGenCustomSelectorCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/CreateGenCustomSelectorCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/GenCustomSelectorCategorySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/GenCustomSelectorCategorySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/GenCustomSelectorCategorySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/GenCustomSelectorCategorySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/UpdateGenCustomSelectorCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/UpdateGenCustomSelectorCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/UpdateGenCustomSelectorCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/custom/selector/category/UpdateGenCustomSelectorCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/CreateDataEntityVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/CreateDataEntityVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/CreateDataEntityVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/CreateDataEntityVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntityDetailVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntitySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntitySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntitySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/GenDataEntitySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/QueryDataEntityVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/QueryDataEntityVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/QueryDataEntityVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/QueryDataEntityVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityGenerateVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityGenerateVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityGenerateVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityGenerateVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/UpdateDataEntityVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/CreateGenDataEntityCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/CreateGenDataEntityCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/CreateGenDataEntityCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/CreateGenDataEntityCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/GenDataEntityCategorySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/GenDataEntityCategorySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/GenDataEntityCategorySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/GenDataEntityCategorySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/UpdateGenDataEntityCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/UpdateGenDataEntityCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/UpdateGenDataEntityCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/entity/category/UpdateGenDataEntityCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/CreateGenDataObjVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/CreateGenDataObjVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/CreateGenDataObjVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/CreateGenDataObjVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjDetailVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjDetailVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjDetailVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjQueryDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjQueryDetailVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjQueryDetailVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjQueryDetailVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/GenDataObjSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/QueryGenDataObjVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/QueryGenDataObjVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/QueryGenDataObjVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/QueryGenDataObjVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/UpdateGenDataObjVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/UpdateGenDataObjVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/UpdateGenDataObjVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/UpdateGenDataObjVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/CreateGenDataObjCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/GenDataObjCategorySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/GenDataObjCategorySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/GenDataObjCategorySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/GenDataObjCategorySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/UpdateGenDataObjCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/UpdateGenDataObjCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/UpdateGenDataObjCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/data/obj/category/UpdateGenDataObjCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateCreateColumnConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateDetailColumnConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateDetailColumnConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateDetailColumnConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateDetailColumnConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateGenerateInfoVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateGenerateInfoVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateGenerateInfoVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateGenerateInfoVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryColumnConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryColumnConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryColumnConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryColumnConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryParamsColumnConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryParamsColumnConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryParamsColumnConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateQueryParamsColumnConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateUpdateColumnConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateUpdateColumnConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateUpdateColumnConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/gen/UpdateUpdateColumnConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/QuerySimpleTableColumnVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/QuerySimpleTableColumnVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/QuerySimpleTableColumnVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/QuerySimpleTableColumnVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/SimpleTableSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/SimpleTableSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/SimpleTableSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/gen/vo/simpledb/SimpleTableSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/CollectMenuBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/CollectMenuBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/CollectMenuBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/CollectMenuBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/ForgetPswUserInfoBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/ForgetPswUserInfoBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/ForgetPswUserInfoBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/ForgetPswUserInfoBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/LoginBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/MenuBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/MenuBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/MenuBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/MenuBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/TelephoneLoginBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/TelephoneLoginBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/auth/TelephoneLoginBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/auth/TelephoneLoginBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java index 4e8de4da61a602e8eeda524974f40823527d6b7b..dfde782eefb44867d25a8a601e7adc245b709656 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/oplog/OpLogInUserCenterBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.inner.bo.oplog; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.core.entity.OpLogs; +import com.lframework.xingyun.core.entity.OpLogs; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/GetQrtzBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/GetQrtzBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/GetQrtzBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/GetQrtzBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/QueryQrtzBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/QueryQrtzBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/QueryQrtzBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/qrtz/QueryQrtzBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/GetSysDeptBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/GetSysDeptBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/GetSysDeptBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/GetSysDeptBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptTreeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptTreeBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptTreeBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dept/SysDeptTreeBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java index 04c4ff69c45a834cf50cbac2c2f52cfccd986c06..e1efe780c849e90c54252062d4689a5819fd7702 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/GetSysDataDicBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java index c1c78167be713947dbf2f1e691ae42bfe84513e1..9708991f1098479295da6cbf8c07b46946fe3b6f 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/QuerySysDataDicBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/SysDataDicSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/SysDataDicSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/SysDataDicSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/SysDataDicSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/GetSysDataDicCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/GetSysDataDicCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/GetSysDataDicCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/GetSysDataDicCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/QuerySysDataDicCategoryBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/QuerySysDataDicCategoryBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/QuerySysDataDicCategoryBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/QuerySysDataDicCategoryBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/SysDataDicCategorySelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/SysDataDicCategorySelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/SysDataDicCategorySelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/category/SysDataDicCategorySelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/GetSysDataDicItemBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/GetSysDataDicItemBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/GetSysDataDicItemBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/GetSysDataDicItemBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/QuerySysDataDicItemBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/QuerySysDataDicItemBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/QuerySysDataDicItemBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/QuerySysDataDicItemBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java index e31d4851f720c931d4f068eddeb265d254d9baa3..d89358e31330b9502eb01a1cfe240648b0de4de1 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/dic/item/SysDataDicItemBo.java @@ -5,7 +5,7 @@ import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.entity.SysDataDicItem; import com.lframework.xingyun.template.inner.service.system.SysDataDicService; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/GetSysGenerateCodeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/GetSysGenerateCodeBo.java new file mode 100644 index 0000000000000000000000000000000000000000..7aadefeae22892a24d4e4872e3212f33c824ccfa --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/GetSysGenerateCodeBo.java @@ -0,0 +1,48 @@ +package com.lframework.xingyun.template.inner.bo.system.generate; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysGenerateCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 编号规则 GetBo + *

+ * + * @author zmj + */ +@Data +public class GetSysGenerateCodeBo extends BaseBo { + + /** + * ID + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty("ID") + private Integer id; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 配置规则 + */ + @ApiModelProperty("配置规则") + private String configStr; + + public GetSysGenerateCodeBo() { + + } + + public GetSysGenerateCodeBo(SysGenerateCode dto) { + + super(dto); + } + +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/QuerySysGenerateCodeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/QuerySysGenerateCodeBo.java new file mode 100644 index 0000000000000000000000000000000000000000..5d8fb76690f401030be609c82ae3fcfe1de71554 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/generate/QuerySysGenerateCodeBo.java @@ -0,0 +1,45 @@ +package com.lframework.xingyun.template.inner.bo.system.generate; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysGenerateCode; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 编号规则 QueryBo + *

+ * + * @author zmj + */ +@Data +public class QuerySysGenerateCodeBo extends BaseBo { + + /** + * ID + */ + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty("ID") + private Long id; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + public QuerySysGenerateCodeBo() { + + } + + public QuerySysGenerateCodeBo(SysGenerateCode dto) { + + super(dto); + } + + @Override + protected void afterInit(SysGenerateCode dto) { + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java similarity index 98% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java index eb00f7a49b4fdc02ef858c9d27462475a4a230f5..a0adc6dc2ebda488ff1ed1d42f56c37df7fd3aac 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/GetSysMenuBo.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.template.inner.bo.system.menu; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.xingyun.template.gen.entity.GenCustomList; import com.lframework.xingyun.template.gen.service.GenCustomListService; import com.lframework.xingyun.template.inner.entity.SysMenu; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/QuerySysMenuBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/QuerySysMenuBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/QuerySysMenuBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/QuerySysMenuBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/SysMenuSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/SysMenuSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/SysMenuSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/menu/SysMenuSelectorBo.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/GetSysMailMessageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/GetSysMailMessageBo.java new file mode 100644 index 0000000000000000000000000000000000000000..826e2cd886198b4feaa49710e7e0e754f807af4d --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/GetSysMailMessageBo.java @@ -0,0 +1,45 @@ +package com.lframework.xingyun.template.inner.bo.system.message.mail; + +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 邮件消息 GetBo + *

+ * + * @author zmj + */ +@Data +public class GetSysMailMessageBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 内容 + */ + @ApiModelProperty("内容") + private String content; + + public GetSysMailMessageBo() { + + } + + public GetSysMailMessageBo(SysMailMessage dto) { + + super(dto); + } + +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/QuerySysPositionBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java similarity index 42% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/QuerySysPositionBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java index 5d660bc77235b8007ca9977c8ce8ad7218320ac4..87de2ac03444086eed82914825faaa59338cc2ee 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/QuerySysPositionBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/mail/QuerySysMailMessageBo.java @@ -1,15 +1,24 @@ -package com.lframework.xingyun.template.inner.bo.system.position; +package com.lframework.xingyun.template.inner.bo.system.message.mail; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; -import com.lframework.xingyun.template.inner.entity.SysPosition; +import com.lframework.starter.web.annotations.constants.EncryType; +import com.lframework.starter.web.annotations.convert.EncryptConvert; import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; +/** + *

+ * 邮件消息 QueryBo + *

+ * + * @author zmj + */ @Data -public class QuerySysPositionBo extends BaseBo { +public class QuerySysMailMessageBo extends BaseBo { /** * ID @@ -18,28 +27,17 @@ public class QuerySysPositionBo extends BaseBo { private String id; /** - * 岗位编号 + * 标题 */ - @ApiModelProperty("岗位编号") - private String code; + @ApiModelProperty("标题") + private String title; /** - * 岗位名称 + * 接收邮箱 */ - @ApiModelProperty("岗位名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; + @ApiModelProperty("接收邮箱") + @EncryptConvert(type = EncryType.EMAIL) + private String mail; /** * 创建人 @@ -55,28 +53,17 @@ public class QuerySysPositionBo extends BaseBo { private LocalDateTime createTime; /** - * 修改人 + * 发送状态 */ - @ApiModelProperty("修改人") - private String updateBy; + @ApiModelProperty("发送状态") + private Integer sendStatus; - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) - private LocalDateTime updateTime; - - public QuerySysPositionBo() { + public QuerySysMailMessageBo() { } - public QuerySysPositionBo(SysPosition dto) { + public QuerySysMailMessageBo(SysMailMessage dto) { super(dto); } - - @Override - protected void afterInit(SysPosition dto) { - } } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/GetSysSiteMessageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/GetSysSiteMessageBo.java new file mode 100644 index 0000000000000000000000000000000000000000..d2fc7a7d6abc9f7f2d40d657a6743cce3b541106 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/GetSysSiteMessageBo.java @@ -0,0 +1,45 @@ +package com.lframework.xingyun.template.inner.bo.system.message.site; + +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 站内信 GetBo + *

+ * + * @author zmj + */ +@Data +public class GetSysSiteMessageBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 内容 + */ + @ApiModelProperty("内容") + private String content; + + public GetSysSiteMessageBo() { + + } + + public GetSysSiteMessageBo(SysSiteMessage dto) { + + super(dto); + } + +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QueryMySysSiteMessageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QueryMySysSiteMessageBo.java new file mode 100644 index 0000000000000000000000000000000000000000..b88085dc6b0ef1c9955376bc8f003794837ec941 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QueryMySysSiteMessageBo.java @@ -0,0 +1,54 @@ +package com.lframework.xingyun.template.inner.bo.system.message.site; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import lombok.Data; + +/** + *

+ * 我的站内信 QueryBo + *

+ * + * @author zmj + */ +@Data +public class QueryMySysSiteMessageBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 是否已读 + */ + @ApiModelProperty("是否已读") + private Boolean readed; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + public QueryMySysSiteMessageBo() { + + } + + public QueryMySysSiteMessageBo(SysSiteMessage dto) { + + super(dto); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QuerySysSiteMessageBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QuerySysSiteMessageBo.java new file mode 100644 index 0000000000000000000000000000000000000000..aa8c9fb4148dc00cdeee1953b08e2c3bc3dd3f79 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/message/site/QuerySysSiteMessageBo.java @@ -0,0 +1,83 @@ +package com.lframework.xingyun.template.inner.bo.system.message.site; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.template.inner.service.system.SysUserService; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import lombok.Data; + +/** + *

+ * 站内信 QueryBo + *

+ * + * @author zmj + */ +@Data +public class QuerySysSiteMessageBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 接收人姓名 + */ + @ApiModelProperty("接收人姓名") + private String receiverName; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 是否已读 + */ + @ApiModelProperty("是否已读") + private Boolean readed; + + /** + * 已读时间 + */ + @ApiModelProperty("已读时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime readTime; + + public QuerySysSiteMessageBo() { + + } + + public QuerySysSiteMessageBo(SysSiteMessage dto) { + + super(dto); + } + + @Override + protected void afterInit(SysSiteMessage dto) { + SysUserService sysUserService = ApplicationUtil.getBean(SysUserService.class); + SysUser receiver = sysUserService.findById(dto.getReceiverId()); + this.receiverName = receiver.getName(); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/module/QuerySysModuleBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/module/QuerySysModuleBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/module/QuerySysModuleBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/module/QuerySysModuleBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/GetSysNoticeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/GetSysNoticeBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/GetSysNoticeBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/GetSysNoticeBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QueryMySysNoticeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QueryMySysNoticeBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QueryMySysNoticeBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QueryMySysNoticeBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QuerySysNoticeBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QuerySysNoticeBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QuerySysNoticeBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notice/QuerySysNoticeBo.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/GetSysNotifyGroupBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/GetSysNotifyGroupBo.java new file mode 100644 index 0000000000000000000000000000000000000000..b534902704cda874bb0158606536c525852cf73e --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/GetSysNotifyGroupBo.java @@ -0,0 +1,94 @@ +package com.lframework.xingyun.template.inner.bo.system.notify; + +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupReceiverService; +import io.swagger.annotations.ApiModelProperty; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import lombok.Data; + +/** + *

+ * 消息通知组 GetBo + *

+ * + * @author zmj + */ +@Data +public class GetSysNotifyGroupBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 接收者类型 + */ + @ApiModelProperty("接收者类型") + private Integer receiverType; + + /** + * 接收者ID + */ + @ApiModelProperty("接收者ID") + private List receiverIds; + + /** + * 消息类型 + */ + @ApiModelProperty("消息类型") + private List messageType; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Boolean available; + + public GetSysNotifyGroupBo() { + + } + + public GetSysNotifyGroupBo(SysNotifyGroup dto) { + + super(dto); + } + + @Override + public BaseBo convert(SysNotifyGroup dto) { + return super.convert(dto, GetSysNotifyGroupBo::getReceiverType, + GetSysNotifyGroupBo::getMessageType); + } + + @Override + protected void afterInit(SysNotifyGroup dto) { + + this.receiverType = dto.getReceiverType().getCode(); + + SysNotifyGroupReceiverService sysNotifyGroupReceiverService = ApplicationUtil.getBean( + SysNotifyGroupReceiverService.class); + this.receiverIds = sysNotifyGroupReceiverService.getReceiverIdsByGroupId(dto.getId()); + + this.messageType = Arrays.stream(dto.getMessageType().split(StringPool.STR_SPLIT)) + .map(Integer::valueOf).collect( + Collectors.toList()); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/QuerySysNotifyGroupBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/QuerySysNotifyGroupBo.java new file mode 100644 index 0000000000000000000000000000000000000000..cf4c7dc2472c95251b3f74dc11562b0703862c5e --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/QuerySysNotifyGroupBo.java @@ -0,0 +1,98 @@ +package com.lframework.xingyun.template.inner.bo.system.notify; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.enums.system.SysNotifyMessageType; +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.stream.Collectors; +import lombok.Data; + +/** + *

+ * 消息通知组 QueryBo + *

+ * + * @author zmj + */ +@Data +public class QuerySysNotifyGroupBo extends BaseBo { + + /** + * ID + */ + @ApiModelProperty("ID") + private String id; + + /** + * 名称 + */ + @ApiModelProperty("名称") + private String name; + + /** + * 接收者类型 + */ + @ApiModelProperty("接收者类型") + private String receiverType; + + /** + * 消息类型 + */ + @ApiModelProperty("消息类型") + private String messageType; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; + + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN) + private LocalDateTime createTime; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private Boolean available; + + public QuerySysNotifyGroupBo() { + + } + + public QuerySysNotifyGroupBo(SysNotifyGroup dto) { + + super(dto); + } + + @Override + public BaseBo convert(SysNotifyGroup dto) { + return super.convert(dto, QuerySysNotifyGroupBo::getReceiverType, + QuerySysNotifyGroupBo::getMessageType); + } + + @Override + protected void afterInit(SysNotifyGroup dto) { + + this.receiverType = dto.getReceiverType().getDesc(); + this.messageType = Arrays.stream(dto.getMessageType().split(StringPool.STR_SPLIT)) + .map(Integer::valueOf).map( + t -> EnumUtil.getDesc(SysNotifyMessageType.class, t)) + .collect(Collectors.joining(StringPool.STR_SPLIT_CN)); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/SysPositionSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java similarity index 47% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/SysPositionSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java index 4e6cffb046e725164d6279ab0661fe4d3de204fe..b180f394442917e99ecabe34c712f7309da6f612 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/SysPositionSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/notify/SysNotifyGroupSelectorBo.java @@ -1,12 +1,12 @@ -package com.lframework.xingyun.template.inner.bo.system.position; +package com.lframework.xingyun.template.inner.bo.system.notify; -import com.lframework.xingyun.template.inner.entity.SysPosition; import com.lframework.starter.web.bo.BaseBo; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class SysPositionSelectorBo extends BaseBo { +public class SysNotifyGroupSelectorBo extends BaseBo { /** * ID @@ -14,12 +14,6 @@ public class SysPositionSelectorBo extends BaseBo { @ApiModelProperty("ID") private String id; - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - /** * 名称 */ @@ -32,17 +26,12 @@ public class SysPositionSelectorBo extends BaseBo { @ApiModelProperty("状态") private Boolean available; - public SysPositionSelectorBo() { + public SysNotifyGroupSelectorBo() { } - public SysPositionSelectorBo(SysPosition dto) { + public SysNotifyGroupSelectorBo(SysNotifyGroup dto) { super(dto); } - - @Override - protected void afterInit(SysPosition dto) { - - } } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/GetSysOpenDomainBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/GetSysOpenDomainBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/GetSysOpenDomainBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/GetSysOpenDomainBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/QuerySysOpenDomainBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/QuerySysOpenDomainBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/QuerySysOpenDomainBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/QuerySysOpenDomainBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/SysOpenDomainSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/SysOpenDomainSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/SysOpenDomainSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/open/SysOpenDomainSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java index 1ec25410e7f95bbb8f7cc87b94aff25a3596defa..0f728fba1922c50c70b122a0ed44cbf6a095000d 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/GetOpLogBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.inner.bo.system.oplog; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.core.entity.OpLogs; +import com.lframework.xingyun.core.entity.OpLogs; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java index 2790b15431e83678fdc97af12bf4b2904ddfa7a5..2a5ba7fcf49ab23e3adaea699651f82dc7a9431e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/oplog/QueryOpLogBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.inner.bo.system.oplog; import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.core.entity.OpLogs; +import com.lframework.xingyun.core.entity.OpLogs; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/GetSysParameterBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/GetSysParameterBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/GetSysParameterBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/GetSysParameterBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/QuerySysParameterBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/QuerySysParameterBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/QuerySysParameterBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/parameter/QuerySysParameterBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/QuerySysDataPermissionModelDetailBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/QuerySysDataPermissionModelDetailBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/QuerySysDataPermissionModelDetailBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/QuerySysDataPermissionModelDetailBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java index 5fbe83b52c1fd744eb78bdcc9128e655d87a7892..b0e00ec6c80345f367f49cc213906314348e15f2 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/permission/SysDataPermissionModelDetailBo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.inner.bo.system.permission; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.web.annotations.convert.EnumConvert; import com.lframework.starter.web.bo.BaseBo; -import com.lframework.xingyun.template.core.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java index bfe97b945a68b339099d579ad998ba9c566ed27c..652f8da12a2b619baf3926588dd759c7965a42be 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/GetSysRoleBo.java @@ -15,15 +15,15 @@ public class GetSysRoleBo extends BaseBo { private String id; /** - * 岗位编号 + * 编号 */ - @ApiModelProperty("岗位编号") + @ApiModelProperty("编号") private String code; /** - * 岗位名称 + * 名称 */ - @ApiModelProperty("岗位名称") + @ApiModelProperty("名称") private String name; /** diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QueryRoleMenuBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QueryRoleMenuBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QueryRoleMenuBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QueryRoleMenuBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/QuerySysRoleBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/SysRoleSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/SysRoleSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/SysRoleSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/role/SysRoleSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/GetTenantBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/GetTenantBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/GetTenantBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/GetTenantBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/QueryTenantBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/QueryTenantBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/QueryTenantBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/QueryTenantBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/TenantSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/TenantSelectorBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/TenantSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/tenant/TenantSelectorBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java similarity index 63% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java index 7a5ea953238f3f2f175ac2402cafa143a40797b5..230caf38aaaca360e3a8951ce09a528a93ac8ab4 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/GetSysUserBo.java @@ -3,22 +3,17 @@ package com.lframework.xingyun.template.inner.bo.system.user; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.entity.SysPosition; import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.core.entity.SysUser; import com.lframework.xingyun.template.inner.entity.SysUserDept; -import com.lframework.xingyun.template.inner.entity.SysUserPosition; import com.lframework.xingyun.template.inner.entity.SysUserRole; import com.lframework.xingyun.template.inner.service.system.SysDeptService; -import com.lframework.xingyun.template.inner.service.system.SysPositionService; import com.lframework.xingyun.template.inner.service.system.SysRoleService; import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import com.lframework.xingyun.template.inner.service.system.SysUserPositionService; import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; -import com.lframework.starter.web.dto.VoidDto; import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Objects; @@ -70,18 +65,6 @@ public class GetSysUserBo extends BaseBo { @ApiModelProperty("性别") private Integer gender; - /** - * 岗位 - */ - @ApiModelProperty("岗位") - private List positions; - - /** - * 岗位名称 - */ - @ApiModelProperty("岗位名称") - private String positionName; - /** * 部门 */ @@ -136,21 +119,6 @@ public class GetSysUserBo extends BaseBo { @Override protected void afterInit(SysUser dto) { - - SysUserPositionService sysUserPositionService = ApplicationUtil.getBean( - SysUserPositionService.class); - List userPositions = sysUserPositionService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userPositions)) { - SysPositionService sysPositionService = ApplicationUtil.getBean(SysPositionService.class); - this.positions = userPositions.stream().map(SysUserPosition::getPositionId) - .collect(Collectors.toList()); - - this.positionName = StringUtil.join(StringPool.STR_SPLIT_CN, - userPositions.stream().map(t -> sysPositionService.findById(t.getPositionId())) - .filter(Objects::nonNull).map(SysPosition::getName) - .collect(Collectors.toList())); - } - SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class); List userDepts = sysUserDeptService.getByUserId(dto.getId()); if (!CollectionUtil.isEmpty(userDepts)) { @@ -177,52 +145,4 @@ public class GetSysUserBo extends BaseBo { .collect(Collectors.toList())); } } - - @Data - public static class PositionBo extends BaseBo { - - /** - * 岗位ID - */ - @ApiModelProperty("岗位ID") - private String id; - - /** - * 岗位名称 - */ - @ApiModelProperty("岗位名称") - private String name; - } - - @Data - public static class DeptBo extends BaseBo { - - /** - * 部门ID - */ - @ApiModelProperty("部门ID") - private String id; - - /** - * 部门名称 - */ - @ApiModelProperty("部门名称") - private String name; - } - - @Data - public static class RoleBo extends BaseBo { - - /** - * 角色ID - */ - @ApiModelProperty("角色ID") - private String id; - - /** - * 角色名称 - */ - @ApiModelProperty("角色名称") - private String name; - } } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java similarity index 76% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java index b23cf6eee2bac58252ed8ea3def79733f881aa86..cb385a9217b830bb8e9e1a0ac1415842ab895269 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QuerySysUserBo.java @@ -4,21 +4,17 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.entity.SysPosition; import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.core.entity.SysUser; import com.lframework.xingyun.template.inner.entity.SysUserDept; -import com.lframework.xingyun.template.inner.entity.SysUserPosition; import com.lframework.xingyun.template.inner.entity.SysUserRole; import com.lframework.xingyun.template.inner.service.system.SysDeptService; -import com.lframework.xingyun.template.inner.service.system.SysPositionService; import com.lframework.xingyun.template.inner.service.system.SysRoleService; import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import com.lframework.xingyun.template.inner.service.system.SysUserPositionService; import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; -import com.lframework.starter.web.bo.BaseBo; -import com.lframework.starter.web.common.utils.ApplicationUtil; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; import java.util.ArrayList; @@ -46,12 +42,6 @@ public class QuerySysUserBo extends BaseBo { @ApiModelProperty("姓名") private String name; - /** - * 岗位名称 - */ - @ApiModelProperty("岗位名称") - private String positionName; - /** * 部门名称 */ @@ -143,21 +133,6 @@ public class QuerySysUserBo extends BaseBo { @Override protected void afterInit(SysUser dto) { - - SysUserPositionService sysUserPositionService = ApplicationUtil.getBean( - SysUserPositionService.class); - List userPositions = sysUserPositionService.getByUserId(dto.getId()); - if (!CollectionUtil.isEmpty(userPositions)) { - SysPositionService sysPositionService = ApplicationUtil.getBean(SysPositionService.class); - List positionNames = new ArrayList<>(userPositions.size()); - for (SysUserPosition userPosition : userPositions) { - SysPosition position = sysPositionService.findById(userPosition.getPositionId()); - positionNames.add(position.getName()); - } - - this.positionName = StringUtil.join(StringPool.STR_SPLIT_CN, positionNames); - } - SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class); List userDepts = sysUserDeptService.getByUserId(dto.getId()); if (!CollectionUtil.isEmpty(userDepts)) { diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QueryUserRoleBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QueryUserRoleBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QueryUserRoleBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/QueryUserRoleBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java similarity index 91% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java index 4a05f618eddd291e404b4c657624970ed2c33792..146ab349c7b11165602f688d3b4f29c9b3d2ea5c 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/system/user/SysUserSelectorBo.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.template.inner.bo.system.user; -import com.lframework.xingyun.template.core.entity.SysUser; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.starter.web.bo.BaseBo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/usercenter/UserInfoBo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/usercenter/UserInfoBo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/usercenter/UserInfoBo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/bo/usercenter/UserInfoBo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java index 401764ad8217d09f9e17a183d0b09d16d595c223..693442e7893ba3111418da45035383d3ea7701ca 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/components/qrtz/DynamicQrtzJob.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.template.inner.components.qrtz; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ReflectUtil; -import com.lframework.xingyun.template.core.components.qrtz.QrtzJob; +import com.lframework.xingyun.core.components.qrtz.QrtzJob; import com.lframework.xingyun.template.inner.enums.QrtzJobType; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.GroovyUtil; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java index 8b09f6aeef0b235a80b1b77c7f11c4e0cc0732f8..6d55e2d46e4b45924922f9da0137e82097021335 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/config/OpLogTimerConfiguration.java @@ -1,10 +1,10 @@ package com.lframework.xingyun.template.inner.config; -import com.lframework.starter.web.common.tenant.TenantContextHolder; -import com.lframework.xingyun.template.core.components.qrtz.QrtzJob; +import com.lframework.starter.web.components.tenant.TenantContextHolder; +import com.lframework.xingyun.core.components.qrtz.QrtzJob; import com.lframework.starter.web.utils.TenantUtil; -import com.lframework.xingyun.template.core.components.qrtz.QrtzHandler; -import com.lframework.xingyun.template.core.service.OpLogsService; +import com.lframework.xingyun.core.components.qrtz.QrtzHandler; +import com.lframework.xingyun.core.service.OpLogsService; import com.lframework.xingyun.template.inner.entity.Tenant; import com.lframework.xingyun.template.inner.service.TenantService; import java.time.LocalDateTime; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java similarity index 85% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java index 3ad0072832f2a6be78e3c843133e03aeb74619d5..9a1dbad58e13f52f87237e4bc9750d5e7b0be232 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/AuthController.java @@ -2,6 +2,8 @@ package com.lframework.xingyun.template.inner.controller; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.codec.Base64; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.code.kaptcha.Producer; import com.lframework.starter.common.constants.PatternPool; import com.lframework.starter.common.constants.StringPool; @@ -12,49 +14,50 @@ import com.lframework.starter.common.utils.DateUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.annotations.OpenApi; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityConstants; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.tenant.TenantContextHolder; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.CaptchaValidator; import com.lframework.starter.web.components.redis.RedisHandler; +import com.lframework.starter.web.components.security.AbstractUserDetails; import com.lframework.starter.web.components.security.IUserTokenResolver; import com.lframework.starter.web.components.security.PasswordEncoderWrapper; +import com.lframework.starter.web.components.security.SecurityConstants; +import com.lframework.starter.web.components.security.SecurityUtil; import com.lframework.starter.web.components.security.UserDetailsService; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import com.lframework.starter.web.config.properties.KaptchaProperties; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.dto.GenerateCaptchaDto; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.service.SysConfService; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.JsonUtil; import com.lframework.starter.web.utils.TenantUtil; -import com.lframework.xingyun.template.core.components.permission.SysDataPermissionDataPermissionType; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; -import com.lframework.xingyun.template.core.enums.SysDataPermissionDataBizType; -import com.lframework.xingyun.template.core.service.SysDataPermissionModelDetailService; -import com.lframework.xingyun.template.core.vo.permission.SysDataPermissionModelDetailVo; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.components.permission.SysDataPermissionDataPermissionType; +import com.lframework.xingyun.core.enums.DefaultOpLogType; import com.lframework.xingyun.template.inner.bo.auth.CollectMenuBo; import com.lframework.xingyun.template.inner.bo.auth.LoginBo; import com.lframework.xingyun.template.inner.bo.auth.MenuBo; import com.lframework.xingyun.template.inner.bo.auth.MenuBo.MetaBo; import com.lframework.xingyun.template.inner.dto.LoginDto; import com.lframework.xingyun.template.inner.dto.MenuDto; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; import com.lframework.xingyun.template.inner.entity.SysUserDept; import com.lframework.xingyun.template.inner.entity.SysUserRole; import com.lframework.xingyun.template.inner.entity.Tenant; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionDataBizType; import com.lframework.xingyun.template.inner.enums.system.SysMenuComponentType; import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; -import com.lframework.xingyun.template.inner.events.LoginEvent; -import com.lframework.xingyun.template.inner.events.LogoutEvent; import com.lframework.xingyun.template.inner.service.SysModuleTenantService; import com.lframework.xingyun.template.inner.service.TenantService; import com.lframework.xingyun.template.inner.service.system.SysDataPermissionDataService; +import com.lframework.xingyun.template.inner.service.system.SysDataPermissionModelDetailService; import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.xingyun.template.inner.vo.system.permission.SysDataPermissionModelDetailVo; +import com.lframework.xingyun.template.inner.vo.system.user.GetLoginCaptchaRequieVo; import com.lframework.xingyun.template.inner.vo.system.user.LoginVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -134,6 +137,50 @@ public class AuthController extends DefaultBaseController { @Autowired private SysModuleTenantService sysModuleTenantService; + @Autowired + private SysConfService sysConfService; + + /** + * 是否为多租户 + */ + @ApiOperation(value = "是否为多租户") + @OpenApi + @GetMapping("/auth/tenant/require") + public InvokeResult getTenantRequire() { + return InvokeResultBuilder.success(TenantUtil.enableTenant()); + } + + /** + * 是否需要登录验证码 + */ + @ApiOperation(value = "是否需要登录验证码") + @OpenApi + @PostMapping("/auth/captcha/require") + public InvokeResult getLoginCaptchaRequire(@Valid GetLoginCaptchaRequieVo vo) { + String username = vo.getUsername(); + String tenantId = null; + if (TenantUtil.enableTenant()) { + // 检查租户是否存在 + Wrapper queryTenantWrapper = Wrappers.lambdaQuery(Tenant.class) + .eq(Tenant::getName, vo.getTenantName()); + Tenant tenant = tenantService.getOne(queryTenantWrapper); + if (tenant == null) { + throw new DefaultClientException("用户名或密码错误！"); + } + + if (!tenant.getAvailable()) { + throw new DefaultClientException("用户已停用，无法登录！"); + } + + tenantId = tenant.getId().toString(); + + TenantContextHolder.setTenantId(tenant.getId()); + } + + String loginCaptchaEnabled = sysConfService.findByKey("login-captcha.enabled", "true"); + return InvokeResultBuilder.success(Boolean.valueOf(loginCaptchaEnabled)); + } + /** * 获取登录验证码 */ @@ -169,6 +216,7 @@ public class AuthController extends DefaultBaseController { @ApiOperation("登录") @OpenApi + @OpLog(type = DefaultOpLogType.AUTH, name = "用户登录") @PostMapping("/auth/login") public InvokeResult login(@Valid LoginVo vo) { @@ -176,16 +224,16 @@ public class AuthController extends DefaultBaseController { String password = vo.getPassword(); String tenantId = null; if (TenantUtil.enableTenant()) { - String[] tmpArr = username.split("@"); - if (tmpArr.length <= 1) { + if (StringUtil.isBlank(vo.getTenantName())) { throw new DefaultClientException("用户名或密码错误！"); } - tenantId = tmpArr[0]; - username = tmpArr[1]; + username = vo.getUsername(); // 检查租户是否存在 - Tenant tenant = tenantService.getById(tenantId); + Wrapper queryTenantWrapper = Wrappers.lambdaQuery(Tenant.class) + .eq(Tenant::getName, vo.getTenantName()); + Tenant tenant = tenantService.getOne(queryTenantWrapper); if (tenant == null) { throw new DefaultClientException("用户名或密码错误！"); } @@ -194,14 +242,20 @@ public class AuthController extends DefaultBaseController { throw new DefaultClientException("用户已停用，无法登录！"); } + tenantId = tenant.getId().toString(); + TenantContextHolder.setTenantId(tenant.getId()); } log.info("用户 {} {} 开始登录", tenantId, username); - String sn = vo.getSn(); - String captcha = vo.getCaptcha(); - captchaValidator.validate(sn, captcha); + String loginCaptchaEnabled = sysConfService.findByKey("login-captcha.enabled", "true"); + log.info("当前用户登录需要验证码 = {}", loginCaptchaEnabled); + if (Boolean.valueOf(loginCaptchaEnabled)) { + String sn = vo.getSn(); + String captcha = vo.getCaptcha(); + captchaValidator.validate(sn, captcha); + } this.checkUserLogin(tenantId == null ? null : Integer.valueOf(tenantId), username, password); @@ -216,22 +270,12 @@ public class AuthController extends DefaultBaseController { @ApiOperation("退出登录") @OpenApi + @OpLog(type = DefaultOpLogType.AUTH, name = "退出登录") @PostMapping("/auth/logout") public InvokeResult logout() { - AbstractUserDetails user = getCurrentUser(); - - String token = null; - if (user != null) { - token = userTokenResolver.getToken(); - } - StpUtil.logout(); - if (user != null) { - ApplicationUtil.publishEvent(new LogoutEvent(this, user, token)); - } - return InvokeResultBuilder.success(); } @@ -366,7 +410,8 @@ public class AuthController extends DefaultBaseController { } List menus = sysMenuService.getMenuByUserId(user.getId(), user.isAdmin(), moduleIds); - List collectMenus = menus.stream().filter(t -> t.getIsCollect()).collect(Collectors.toList()); + List collectMenus = menus.stream().filter(t -> t.getIsCollect()) + .collect(Collectors.toList()); List results = collectMenus.stream().map(t -> { CollectMenuBo result = new CollectMenuBo(); result.setId(t.getId()); @@ -468,11 +513,8 @@ public class AuthController extends DefaultBaseController { StpUtil.getSession().set(SecurityConstants.USER_INFO_KEY, user); String token = userTokenResolver.getToken(); - ApplicationUtil.publishEvent(new LoginEvent(this, SecurityUtil.getCurrentUser(), token)); - - LoginDto dto = new LoginDto(token, user.getName(), user.getPermissions()); - return dto; + return new LoginDto(token, user.getName(), user.getPermissions()); } private void checkUserLogin(Integer tenantId, String username, String password) { diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/QrtzController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/QrtzController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/QrtzController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/QrtzController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java index 48bb6f9a486485d5951f22661e552492167c8bb7..f44d6e3fc54924a9defca5705a87b93721f5f797 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/UserCenterController.java @@ -5,25 +5,23 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.inner.bo.usercenter.UserInfoBo; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.entity.OpLogs; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.service.OpLogsService; -import com.lframework.xingyun.template.core.vo.QueryOpLogsVo; -import com.lframework.xingyun.template.inner.events.UpdateUserEvent; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.PasswordEncoderWrapper; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.entity.OpLogs; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.service.OpLogsService; +import com.lframework.xingyun.core.vo.QueryOpLogsVo; import com.lframework.xingyun.template.inner.bo.oplog.OpLogInUserCenterBo; +import com.lframework.xingyun.template.inner.bo.usercenter.UserInfoBo; import com.lframework.xingyun.template.inner.dto.UserInfoDto; import com.lframework.xingyun.template.inner.service.system.SysUserService; -import com.lframework.starter.web.components.security.PasswordEncoderWrapper; -import com.lframework.starter.web.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.common.utils.ApplicationUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -133,8 +131,6 @@ public class UserCenterController extends DefaultBaseController { sysUserService.cleanCacheByKey(user.getId()); - ApplicationUtil.publishEvent(new UpdateUserEvent(this, user.getId())); - return InvokeResultBuilder.success(); } @@ -164,8 +160,6 @@ public class UserCenterController extends DefaultBaseController { sysUserService.cleanCacheByKey(user.getId()); - ApplicationUtil.publishEvent(new UpdateUserEvent(this, user.getId())); - return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java similarity index 79% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java index b59898a571ea10ff98d4ae052af4eac78efb6f6c..d64a27998935b664605f18e81ee6d28f2f213b97 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/DefaultSysSelectorController.java @@ -2,49 +2,49 @@ package com.lframework.xingyun.template.inner.controller.system; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.components.tenant.TenantContextHolder; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.web.utils.TenantUtil; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.template.inner.bo.system.dept.SysDeptSelectorBo; import com.lframework.xingyun.template.inner.bo.system.dic.SysDataDicSelectorBo; +import com.lframework.xingyun.template.inner.bo.system.dic.category.SysDataDicCategorySelectorBo; import com.lframework.xingyun.template.inner.bo.system.menu.SysMenuSelectorBo; +import com.lframework.xingyun.template.inner.bo.system.notify.SysNotifyGroupSelectorBo; import com.lframework.xingyun.template.inner.bo.system.open.SysOpenDomainSelectorBo; -import com.lframework.xingyun.template.inner.bo.system.position.SysPositionSelectorBo; import com.lframework.xingyun.template.inner.bo.system.role.SysRoleSelectorBo; import com.lframework.xingyun.template.inner.bo.system.tenant.TenantSelectorBo; import com.lframework.xingyun.template.inner.bo.system.user.SysUserSelectorBo; -import com.lframework.xingyun.template.inner.entity.SysDept; -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.core.entity.SysUser; import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.xingyun.template.inner.entity.SysDataDicCategory; +import com.lframework.xingyun.template.inner.entity.SysDept; +import com.lframework.xingyun.template.inner.entity.SysMenu; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; import com.lframework.xingyun.template.inner.entity.SysOpenDomain; +import com.lframework.xingyun.template.inner.entity.SysRole; import com.lframework.xingyun.template.inner.entity.Tenant; -import com.lframework.starter.web.resp.PageResult; import com.lframework.xingyun.template.inner.service.SysModuleTenantService; +import com.lframework.xingyun.template.inner.service.TenantService; +import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; import com.lframework.xingyun.template.inner.service.system.SysDataDicService; +import com.lframework.xingyun.template.inner.service.system.SysDeptService; import com.lframework.xingyun.template.inner.service.system.SysMenuService; -import com.lframework.xingyun.template.inner.service.system.SysPositionService; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupService; +import com.lframework.xingyun.template.inner.service.system.SysOpenDomainService; import com.lframework.xingyun.template.inner.service.system.SysRoleService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; import com.lframework.xingyun.template.inner.vo.system.dic.SysDataDicSelectorVo; import com.lframework.xingyun.template.inner.vo.system.dic.category.SysDataDicCategorySelectorVo; import com.lframework.xingyun.template.inner.vo.system.menu.SysMenuSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.position.SysPositionSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.tenant.TenantSelectorVo; -import com.lframework.xingyun.template.inner.service.TenantService; -import com.lframework.xingyun.template.inner.service.system.SysDataDicCategoryService; -import com.lframework.xingyun.template.inner.service.system.SysDeptService; -import com.lframework.xingyun.template.inner.service.system.SysOpenDomainService; -import com.lframework.xingyun.template.inner.service.system.SysUserService; -import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.template.inner.vo.system.notify.SysNotifyGroupSelectorVo; import com.lframework.xingyun.template.inner.vo.system.open.SysOpenDomainSelectorVo; import com.lframework.xingyun.template.inner.vo.system.role.SysRoleSelectorVo; +import com.lframework.xingyun.template.inner.vo.system.tenant.TenantSelectorVo; import com.lframework.xingyun.template.inner.vo.system.user.SysUserSelectorVo; -import com.lframework.xingyun.template.inner.bo.system.dic.category.SysDataDicCategorySelectorBo; -import com.lframework.starter.web.common.tenant.TenantContextHolder; -import com.lframework.starter.web.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.utils.TenantUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -79,9 +79,6 @@ public class DefaultSysSelectorController extends DefaultBaseController { @Autowired private SysDeptService sysDeptService; - @Autowired - private SysPositionService sysPositionService; - @Autowired private SysRoleService sysRoleService; @@ -100,6 +97,9 @@ public class DefaultSysSelectorController extends DefaultBaseController { @Autowired private SysModuleTenantService sysModuleTenantService; + @Autowired + private SysNotifyGroupService sysNotifyGroupService; + /** * 系统菜单 */ @@ -110,7 +110,8 @@ public class DefaultSysSelectorController extends DefaultBaseController { // 先查询当前租户使用的module List moduleIds = null; if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId(TenantContextHolder.getTenantId()); + moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( + TenantContextHolder.getTenantId()); } List results = CollectionUtil.emptyList(); @@ -139,8 +140,7 @@ public class DefaultSysSelectorController extends DefaultBaseController { @GetMapping("/role") public InvokeResult> role(@Valid SysRoleSelectorVo vo) { - PageResult pageResult = sysRoleService.selector(getPageIndex(vo), - getPageSize(vo), vo); + PageResult pageResult = sysRoleService.selector(getPageIndex(vo), getPageSize(vo), vo); List datas = pageResult.getDatas(); List results = null; if (CollectionUtil.isNotEmpty(datas)) { @@ -163,12 +163,9 @@ public class DefaultSysSelectorController extends DefaultBaseController { } List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysRoleService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(SysRoleSelectorBo::new) - .collect( - Collectors.toList()); + .map(t -> sysRoleService.findById(t)).filter(Objects::nonNull).collect(Collectors.toList()); + List results = datas.stream().map(SysRoleSelectorBo::new) + .collect(Collectors.toList()); return InvokeResultBuilder.success(results); } @@ -177,8 +174,7 @@ public class DefaultSysSelectorController extends DefaultBaseController { @GetMapping("/tenant") public InvokeResult> tenant(@Valid TenantSelectorVo vo) { - PageResult pageResult = tenantService.selector(getPageIndex(vo), - getPageSize(vo), vo); + PageResult pageResult = tenantService.selector(getPageIndex(vo), getPageSize(vo), vo); List datas = pageResult.getDatas(); List results = null; if (CollectionUtil.isNotEmpty(datas)) { @@ -200,13 +196,10 @@ public class DefaultSysSelectorController extends DefaultBaseController { return InvokeResultBuilder.success(CollectionUtil.emptyList()); } - List datas = ids.stream().filter(Objects::nonNull) - .map(t -> tenantService.findById(t)) + List datas = ids.stream().filter(Objects::nonNull).map(t -> tenantService.findById(t)) .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(TenantSelectorBo::new) - .collect( - Collectors.toList()); + List results = datas.stream().map(TenantSelectorBo::new) + .collect(Collectors.toList()); return InvokeResultBuilder.success(results); } @@ -215,8 +208,7 @@ public class DefaultSysSelectorController extends DefaultBaseController { @GetMapping("/user") public InvokeResult> user(@Valid SysUserSelectorVo vo) { - PageResult pageResult = sysUserService.selector(getPageIndex(vo), - getPageSize(vo), vo); + PageResult pageResult = sysUserService.selector(getPageIndex(vo), getPageSize(vo), vo); List datas = pageResult.getDatas(); List results = null; @@ -240,52 +232,9 @@ public class DefaultSysSelectorController extends DefaultBaseController { } List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysUserService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(SysUserSelectorBo::new) - .collect( - Collectors.toList()); - - return InvokeResultBuilder.success(results); - } - - @ApiOperation("岗位") - @GetMapping("/position") - public InvokeResult> position(@Valid SysPositionSelectorVo vo) { - - PageResult pageResult = sysPositionService.selector(getPageIndex(vo), - getPageSize(vo), - vo); - List datas = pageResult.getDatas(); - List results = null; - - if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(SysPositionSelectorBo::new).collect(Collectors.toList()); - } - - return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); - } - - /** - * 加载岗位 - */ - @ApiOperation("加载岗位") - @PostMapping("/position/load") - public InvokeResult> loadPosition( - @RequestBody(required = false) List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return InvokeResultBuilder.success(CollectionUtil.emptyList()); - } - - List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysPositionService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(SysPositionSelectorBo::new) - .collect( - Collectors.toList()); + .map(t -> sysUserService.findById(t)).filter(Objects::nonNull).collect(Collectors.toList()); + List results = datas.stream().map(SysUserSelectorBo::new) + .collect(Collectors.toList()); return InvokeResultBuilder.success(results); } @@ -320,20 +269,17 @@ public class DefaultSysSelectorController extends DefaultBaseController { } List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysDataDicCategoryService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); + .map(t -> sysDataDicCategoryService.findById(t)).filter(Objects::nonNull) + .collect(Collectors.toList()); List results = datas.stream() - .map(SysDataDicCategorySelectorBo::new) - .collect( - Collectors.toList()); + .map(SysDataDicCategorySelectorBo::new).collect(Collectors.toList()); return InvokeResultBuilder.success(results); } @ApiOperation("数据字典") @GetMapping("/dic") - public InvokeResult> dataDic( - @Valid SysDataDicSelectorVo vo) { + public InvokeResult> dataDic(@Valid SysDataDicSelectorVo vo) { PageResult pageResult = sysDataDicService.selector(getPageIndex(vo), getPageSize(vo), vo); @@ -360,12 +306,10 @@ public class DefaultSysSelectorController extends DefaultBaseController { } List datas = ids.stream().filter(StringUtil::isNotBlank) - .map(t -> sysDataDicService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); - List results = datas.stream() - .map(SysDataDicSelectorBo::new) - .collect( - Collectors.toList()); + .map(t -> sysDataDicService.findById(t)).filter(Objects::nonNull) + .collect(Collectors.toList()); + List results = datas.stream().map(SysDataDicSelectorBo::new) + .collect(Collectors.toList()); return InvokeResultBuilder.success(results); } @@ -403,11 +347,47 @@ public class DefaultSysSelectorController extends DefaultBaseController { } List datas = ids.stream().filter(Objects::nonNull) - .map(t -> sysOpenDomainService.findById(t)) - .filter(Objects::nonNull).collect(Collectors.toList()); + .map(t -> sysOpenDomainService.findById(t)).filter(Objects::nonNull) + .collect(Collectors.toList()); List results = datas.stream().map(SysOpenDomainSelectorBo::new) - .collect( - Collectors.toList()); + .collect(Collectors.toList()); + + return InvokeResultBuilder.success(results); + } + + @ApiOperation("消息通知组") + @GetMapping("/notify/group") + public InvokeResult> notifyGroup( + @Valid SysNotifyGroupSelectorVo vo) { + + PageResult pageResult = sysNotifyGroupService.selector(getPageIndex(vo), + getPageSize(vo), vo); + List datas = pageResult.getDatas(); + List results = null; + if (CollectionUtil.isNotEmpty(datas)) { + results = datas.stream().map(SysNotifyGroupSelectorBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 加载消息通知组 + */ + @ApiOperation("加载消息通知组") + @PostMapping("/notify/group/load") + public InvokeResult> loadNotifyGroup( + @RequestBody(required = false) List ids) { + + if (CollectionUtil.isEmpty(ids)) { + return InvokeResultBuilder.success(CollectionUtil.emptyList()); + } + + List datas = ids.stream().filter(StringUtil::isNotBlank) + .map(t -> sysNotifyGroupService.findById(t)).filter(Objects::nonNull) + .collect(Collectors.toList()); + List results = datas.stream().map(SysNotifyGroupSelectorBo::new) + .collect(Collectors.toList()); return InvokeResultBuilder.success(results); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java index f0a194d179a86fde399601e57c0c70e84cf8a0e9..5bc14ac170821625139867fdde2463a7ff6c56c8 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/OpLogController.java @@ -10,9 +10,9 @@ import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; import com.lframework.xingyun.template.inner.bo.system.oplog.GetOpLogBo; import com.lframework.xingyun.template.inner.bo.system.oplog.QueryOpLogBo; -import com.lframework.xingyun.template.core.entity.OpLogs; -import com.lframework.xingyun.template.core.service.OpLogsService; -import com.lframework.xingyun.template.core.vo.QueryOpLogsVo; +import com.lframework.xingyun.core.entity.OpLogs; +import com.lframework.xingyun.core.service.OpLogsService; +import com.lframework.xingyun.core.vo.QueryOpLogsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicCategoryController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicCategoryController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicCategoryController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicCategoryController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicItemController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicItemController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicItemController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataDicItemController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java similarity index 91% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java index 69ffc0d16997778decdaa9a6af524ded168293b8..1bfc4ed73515c78a0f0258cda67da7cda9825522 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionDataController.java @@ -2,13 +2,13 @@ package com.lframework.xingyun.template.inner.controller.system; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.core.vo.permission.CreateSysDataPermissionDataVo; +import com.lframework.xingyun.template.inner.vo.system.permission.CreateSysDataPermissionDataVo; import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; -import com.lframework.xingyun.template.core.enums.SysDataPermissionDataBizType; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionDataBizType; import com.lframework.xingyun.template.inner.service.system.SysDataPermissionDataService; import com.lframework.xingyun.template.inner.service.system.SysRoleService; -import com.lframework.starter.web.common.security.SecurityConstants; +import com.lframework.starter.web.components.security.SecurityConstants; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java index 471d68b4756e6150078e33e15cf8bae1aa489032..9f1cde8bdd61859d0fa93ef538f9c198e2aecf21 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDataPermissionModelDetailController.java @@ -12,14 +12,14 @@ import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.JsonUtil; import com.lframework.xingyun.template.inner.bo.system.permission.QuerySysDataPermissionModelDetailBo; import com.lframework.xingyun.template.inner.bo.system.permission.SysDataPermissionModelDetailBo; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; -import com.lframework.xingyun.template.core.entity.SysDataPermissionModelDetail; -import com.lframework.xingyun.template.core.enums.SysDataPermissionDataBizType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailCalcType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailConditionType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailNodeType; -import com.lframework.xingyun.template.core.service.SysDataPermissionModelDetailService; -import com.lframework.xingyun.template.core.vo.permission.SysDataPermissionModelDetailVo; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionDataBizType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailCalcType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailConditionType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailNodeType; +import com.lframework.xingyun.template.inner.service.system.SysDataPermissionModelDetailService; +import com.lframework.xingyun.template.inner.vo.system.permission.SysDataPermissionModelDetailVo; import com.lframework.xingyun.template.inner.service.system.SysDataPermissionDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java similarity index 80% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java index 153cc3257ee6ad4925b10541f945f7cc26b1fbe5..1100e034d7bc263808a77cc335da601a4cd1c4b3 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysDeptController.java @@ -2,19 +2,19 @@ package com.lframework.xingyun.template.inner.controller.system; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.web.annotations.security.HasPermission; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.template.inner.bo.system.dept.GetSysDeptBo; +import com.lframework.xingyun.template.inner.bo.system.dept.SysDeptTreeBo; import com.lframework.xingyun.template.inner.entity.SysDept; import com.lframework.xingyun.template.inner.enums.system.SysDeptNodeType; -import com.lframework.xingyun.template.core.service.RecursionMappingService; import com.lframework.xingyun.template.inner.service.system.SysDeptService; import com.lframework.xingyun.template.inner.vo.system.dept.CreateSysDeptVo; import com.lframework.xingyun.template.inner.vo.system.dept.UpdateSysDeptVo; -import com.lframework.xingyun.template.inner.bo.system.dept.GetSysDeptBo; -import com.lframework.xingyun.template.inner.bo.system.dept.SysDeptTreeBo; -import com.lframework.starter.web.annotations.security.HasPermission; -import com.lframework.starter.web.common.utils.ApplicationUtil; -import com.lframework.starter.web.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -91,46 +90,44 @@ public class SysDeptController extends DefaultBaseController { } /** - * 批量停用部门 + * 停用部门 */ - @ApiOperation("批量停用部门") + @ApiOperation("停用部门") @HasPermission({"system:dept:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "请选择需要停用的部门！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "部门ID不能为空！") String id) { - sysDeptService.batchUnable(ids); + sysDeptService.unable(id); - List batchIds = new ArrayList<>(ids); + List batchIds = new ArrayList<>(); + batchIds.add(id); - for (String id : ids) { - List tmp = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(tmp); - } + List tmp = recursionMappingService.getNodeChildIds(id, + ApplicationUtil.getBean(SysDeptNodeType.class)); + batchIds.addAll(tmp); sysDeptService.cleanCacheByKeys(batchIds); return InvokeResultBuilder.success(); } /** - * 批量启用部门 + * 启用部门 */ - @ApiOperation("批量启用部门") + @ApiOperation("启用部门") @HasPermission({"system:dept:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "请选择需要启用的部门！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "部门ID", required = true) @NotEmpty(message = "部门ID不能为空！") String id) { - sysDeptService.batchEnable(ids); + sysDeptService.enable(id); - List batchIds = new ArrayList<>(ids); + List batchIds = new ArrayList<>(); + batchIds.add(id); - for (String id : ids) { - List tmp = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - batchIds.addAll(tmp); - } + List tmp = recursionMappingService.getNodeParentIds(id, + ApplicationUtil.getBean(SysDeptNodeType.class)); + batchIds.addAll(tmp); sysDeptService.cleanCacheByKeys(batchIds); return InvokeResultBuilder.success(); diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysGenerateCodeController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysGenerateCodeController.java new file mode 100644 index 0000000000000000000000000000000000000000..53f216afafb3eccf952f1c4ddae0b4390404172d --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysGenerateCodeController.java @@ -0,0 +1,168 @@ +package com.lframework.xingyun.template.inner.controller.system; + +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.web.annotations.security.HasPermission; +import com.lframework.starter.web.components.generator.GenerateCodeFactory; +import com.lframework.starter.web.components.generator.rule.GenerateCodeRule; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.template.inner.bo.system.generate.GetSysGenerateCodeBo; +import com.lframework.xingyun.template.inner.bo.system.generate.QuerySysGenerateCodeBo; +import com.lframework.xingyun.template.inner.entity.SysGenerateCode; +import com.lframework.xingyun.template.inner.service.system.SysGenerateCodeService; +import com.lframework.xingyun.template.inner.vo.system.generate.CreateSysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.PreviewSysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.QuerySysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.SettingSysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.UpdateSysGenerateCodeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 编号规则 Controller + * + * @author zmj + */ +@Api(tags = "编号规则") +@Validated +@RestController +@RequestMapping("/system/generate/code") +public class SysGenerateCodeController extends DefaultBaseController { + + @Autowired + private SysGenerateCodeService sysGenerateCodeService; + + @Autowired + private GenerateCodeService generateCodeService; + + /** + * 查询列表 + */ + @ApiOperation("查询列表") + @HasPermission({"system:generate-code:manage"}) + @GetMapping("/query") + public InvokeResult> query(@Valid QuerySysGenerateCodeVo vo) { + + PageResult pageResult = sysGenerateCodeService.query(getPageIndex(vo), + getPageSize(vo), vo); + + List datas = pageResult.getDatas(); + List results = null; + + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QuerySysGenerateCodeBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 根据ID查询 + */ + @ApiOperation("根据ID查询") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @HasPermission({"system:generate-code:manage"}) + @GetMapping + public InvokeResult get(@NotNull(message = "id不能为空！") Long id) { + + SysGenerateCode data = sysGenerateCodeService.getById(id); + if (data == null) { + throw new DefaultClientException("编号规则不存在！"); + } + + GetSysGenerateCodeBo result = new GetSysGenerateCodeBo(data); + + return InvokeResultBuilder.success(result); + } + + /** + * 新增 + */ + @ApiOperation("新增") + @HasPermission({"system:generate-code:manage"}) + @PostMapping + public InvokeResult create(@Valid CreateSysGenerateCodeVo vo) { + + sysGenerateCodeService.create(vo); + + return InvokeResultBuilder.success(); + } + + /** + * 修改 + */ + @ApiOperation("修改") + @HasPermission({"system:generate-code:manage"}) + @PutMapping + public InvokeResult update(@Valid UpdateSysGenerateCodeVo vo) { + + sysGenerateCodeService.update(vo); + + sysGenerateCodeService.cleanCacheByKey(vo.getId()); + + return InvokeResultBuilder.success(); + } + + /** + * 根据ID删除 + */ + @ApiOperation("根据ID删除") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @HasPermission({"system:generate-code:manage"}) + @DeleteMapping + public InvokeResult deleteById(@NotNull(message = "id不能为空！") Integer id) { + + SysGenerateCode data = sysGenerateCodeService.findById(id); + + sysGenerateCodeService.deleteById(id); + + sysGenerateCodeService.cleanCacheByKey(id); + + return InvokeResultBuilder.success(); + } + + /** + * 设置规则 + */ + @ApiOperation("设置规则") + @HasPermission({"system:generate-code:manage"}) + @PatchMapping + public InvokeResult setting(@Valid SettingSysGenerateCodeVo vo) { + + sysGenerateCodeService.setting(vo); + + sysGenerateCodeService.cleanCacheByKey(vo.getId()); + + return InvokeResultBuilder.success(); + } + + /** + * 预览 + */ + @ApiOperation("预览") + @HasPermission({"system:generate-code:manage"}) + @PostMapping("/preview") + public InvokeResult preview(@Valid PreviewSysGenerateCodeVo vo) { + + return InvokeResultBuilder.success(GenerateCodeFactory.generateExample(vo.getConfigStr())); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMailMessageController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMailMessageController.java new file mode 100644 index 0000000000000000000000000000000000000000..82adf81d1d8815af66ab1536569d3f47e6c377fb --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMailMessageController.java @@ -0,0 +1,83 @@ +package com.lframework.xingyun.template.inner.controller.system; + +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.web.annotations.security.HasPermission; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.template.inner.bo.system.message.mail.GetSysMailMessageBo; +import com.lframework.xingyun.template.inner.bo.system.message.mail.QuerySysMailMessageBo; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; +import com.lframework.xingyun.template.inner.service.system.SysMailMessageService; +import com.lframework.xingyun.template.inner.vo.system.message.mail.QuerySysMailMessageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 邮件消息 Controller + * + * @author zmj + */ +@Api(tags = "邮件消息") +@Validated +@RestController +@RequestMapping("/system/message/mail") +public class SysMailMessageController extends DefaultBaseController { + + @Autowired + private SysMailMessageService sysMailMessageService; + + /** + * 查询列表 + */ + @ApiOperation("查询列表") + @HasPermission("system:mail-message:manage") + @GetMapping("/query") + public InvokeResult> query(@Valid QuerySysMailMessageVo vo) { + + PageResult pageResult = sysMailMessageService.query(getPageIndex(vo), + getPageSize(vo), + vo); + + List datas = pageResult.getDatas(); + List results = null; + + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QuerySysMailMessageBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 根据ID查询 + */ + @ApiOperation("根据ID查询") + @HasPermission("system:mail-message:manage") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @GetMapping + public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { + + SysMailMessage data = sysMailMessageService.findById(id); + if (data == null) { + throw new DefaultClientException("邮件消息不存在！"); + } + + GetSysMailMessageBo result = new GetSysMailMessageBo(data); + + return InvokeResultBuilder.success(result); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java index 488be5987fdad2fadee8cf9d4c7a1287853560ac..d6cad18ac088c6968367e432fa3717c04d864bef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysMenuController.java @@ -5,21 +5,22 @@ import com.lframework.starter.common.exceptions.impl.InputErrorException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; +import com.lframework.starter.common.utils.ThreadUtil; +import com.lframework.starter.web.annotations.security.HasPermission; +import com.lframework.starter.web.components.tenant.TenantContextHolder; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.utils.TenantUtil; import com.lframework.xingyun.template.inner.bo.system.menu.GetSysMenuBo; import com.lframework.xingyun.template.inner.bo.system.menu.QuerySysMenuBo; +import com.lframework.xingyun.template.inner.entity.SysMenu; +import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; import com.lframework.xingyun.template.inner.service.SysModuleTenantService; import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.xingyun.template.inner.vo.system.menu.CreateSysMenuVo; import com.lframework.xingyun.template.inner.vo.system.menu.UpdateSysMenuVo; -import com.lframework.starter.web.common.tenant.TenantContextHolder; -import com.lframework.starter.web.controller.DefaultBaseController; -import com.lframework.starter.web.resp.InvokeResult; -import com.lframework.starter.web.resp.InvokeResultBuilder; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.utils.TenantUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -30,14 +31,12 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; -import com.lframework.starter.web.annotations.security.HasPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -69,7 +68,8 @@ public class SysMenuController extends DefaultBaseController { // 先查询当前租户使用的module List moduleIds = null; if (TenantUtil.enableTenant()) { - moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId(TenantContextHolder.getTenantId()); + moduleIds = sysModuleTenantService.getAvailableModuleIdsByTenantId( + TenantContextHolder.getTenantId()); } List results = CollectionUtil.emptyList(); @@ -147,37 +147,33 @@ public class SysMenuController extends DefaultBaseController { } /** - * 批量启用 + * 启用 */ - @ApiOperation("批量启用") + @ApiOperation("启用") @HasPermission({"system:menu:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "请选择需要启用的菜单！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "菜单ID不能为空！") String id) { - sysMenuService.batchEnable(ids, SecurityUtil.getCurrentUser().getId()); + sysMenuService.enable(id); - for (String id : ids) { - sysMenuService.cleanCacheByKey(id); - } + sysMenuService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量停用 + * 停用 */ - @ApiOperation("批量停用") + @ApiOperation("停用") @HasPermission({"system:menu:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "请选择需要停用的菜单！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "菜单ID", required = true) @NotEmpty(message = "菜单ID不能为空！") String id) { - sysMenuService.batchUnable(ids, SecurityUtil.getCurrentUser().getId()); + sysMenuService.unable(id); - for (String id : ids) { - sysMenuService.cleanCacheByKey(id); - } + sysMenuService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysModuleController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysModuleController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysModuleController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysModuleController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java index 56c1f9ca398daf9c238280ddd8a5737cfa142857..274676ebda113be23a937aa41ef7a956f17b15a7 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNoticeController.java @@ -6,8 +6,8 @@ import com.lframework.starter.common.utils.ThreadUtil; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.starter.web.common.threads.DefaultRunnable; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.threads.DefaultRunnable; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; @@ -123,7 +123,6 @@ public class SysNoticeController extends DefaultBaseController { */ @ApiOperation("根据ID查询") @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) - @HasPermission({"system:notice:query"}) @GetMapping public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysPositionController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java similarity index 36% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysPositionController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java index f0a97c2413377d9553eaf32d08fd90bcfa9a4927..474c07c690298d486355a8925735b6833e5e6e42 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysPositionController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysNotifyGroupController.java @@ -2,32 +2,29 @@ package com.lframework.xingyun.template.inner.controller.system; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.xingyun.template.inner.service.system.SysPositionService; -import com.lframework.xingyun.template.inner.vo.system.position.CreateSysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.QuerySysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.UpdateSysPositionVo; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.inner.bo.system.position.GetSysPositionBo; -import com.lframework.xingyun.template.inner.bo.system.position.QuerySysPositionBo; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.template.inner.bo.system.notify.GetSysNotifyGroupBo; +import com.lframework.xingyun.template.inner.bo.system.notify.QuerySysNotifyGroupBo; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupService; +import com.lframework.xingyun.template.inner.vo.system.notify.CreateSysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.QuerySysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.UpdateSysNotifyGroupVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import java.util.List; import java.util.stream.Collectors; import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -35,119 +32,86 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * 岗位管理 + * 消息通知组 Controller * * @author zmj */ -@Api(tags = "岗位管理") +@Api(tags = "消息通知组") @Validated @RestController -@RequestMapping("/system/position") -public class SysPositionController extends DefaultBaseController { +@RequestMapping("/sys/notify/group") +public class SysNotifyGroupController extends DefaultBaseController { @Autowired - private SysPositionService sysPositionService; + private SysNotifyGroupService sysNotifyGroupService; /** - * 岗位列表 + * 查询列表 */ - @ApiOperation("岗位列表") - @HasPermission({"system:position:query","system:position:add","system:position:modify"}) + @ApiOperation("查询列表") + @HasPermission({"system:notify-group:query"}) @GetMapping("/query") - public InvokeResult> query(@Valid QuerySysPositionVo vo) { + public InvokeResult> query( + @Valid QuerySysNotifyGroupVo vo) { - PageResult pageResult = sysPositionService.query(getPageIndex(vo), + PageResult pageResult = sysNotifyGroupService.query( + getPageIndex(vo), getPageSize(vo), vo); - List datas = pageResult.getDatas(); - List results = null; + List datas = pageResult.getDatas(); + List results = null; if (!CollectionUtil.isEmpty(datas)) { - results = datas.stream().map(QuerySysPositionBo::new).collect(Collectors.toList()); + results = datas.stream().map(QuerySysNotifyGroupBo::new).collect(Collectors.toList()); } return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); } /** - * 查询岗位 + * 根据ID查询 */ - @ApiOperation("查询岗位") + @ApiOperation("根据ID查询") @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true) - @HasPermission({"system:position:query","system:position:add","system:position:modify"}) - @GetMapping - public InvokeResult get(@NotBlank(message = "ID不能为空！") String id) { + @HasPermission({"system:notify-group:query"}) + @GetMapping("/detail") + public InvokeResult getDetail( + @NotBlank(message = "id不能为空！") String id) { - SysPosition data = sysPositionService.findById(id); + SysNotifyGroup data = sysNotifyGroupService.findById(id); if (data == null) { - throw new DefaultClientException("岗位不存在！"); + throw new DefaultClientException("消息通知组不存在！"); } - GetSysPositionBo result = new GetSysPositionBo(data); + GetSysNotifyGroupBo result = new GetSysNotifyGroupBo(data); return InvokeResultBuilder.success(result); } /** - * 批量停用岗位 - */ - @ApiOperation("批量停用岗位") - @HasPermission({"system:position:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "岗位ID", required = true) @NotEmpty(message = "请选择需要停用的岗位！") @RequestBody List ids) { - - sysPositionService.batchUnable(ids); - - for (String id : ids) { - sysPositionService.cleanCacheByKey(id); - } - - return InvokeResultBuilder.success(); - } - - /** - * 批量启用岗位 - */ - @ApiOperation("批量启用岗位") - @HasPermission({"system:position:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "岗位ID", required = true) @NotEmpty(message = "请选择需要启用的岗位！") @RequestBody List ids) { - - sysPositionService.batchEnable(ids); - - for (String id : ids) { - sysPositionService.cleanCacheByKey(id); - } - - return InvokeResultBuilder.success(); - } - - /** - * 新增岗位 + * 新增 */ - @ApiOperation("新增岗位") - @HasPermission({"system:position:add"}) + @ApiOperation("新增") + @HasPermission({"system:notify-group:add"}) @PostMapping - public InvokeResult create(@Valid CreateSysPositionVo vo) { + public InvokeResult create(@Valid @RequestBody CreateSysNotifyGroupVo vo) { - sysPositionService.create(vo); + sysNotifyGroupService.create(vo); return InvokeResultBuilder.success(); } /** - * 修改岗位 + * 修改 */ - @ApiOperation("修改岗位") - @HasPermission({"system:position:modify"}) + @ApiOperation("修改") + @HasPermission({"system:notify-group:modify"}) @PutMapping - public InvokeResult update(@Valid UpdateSysPositionVo vo) { + public InvokeResult update(@Valid @RequestBody UpdateSysNotifyGroupVo vo) { - sysPositionService.update(vo); + sysNotifyGroupService.update(vo); - sysPositionService.cleanCacheByKey(vo.getId()); + sysNotifyGroupService.cleanCacheByKey(vo.getId()); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysOpenDomainController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysOpenDomainController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysOpenDomainController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysOpenDomainController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysParameterController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysParameterController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysParameterController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysParameterController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java similarity index 85% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java index a98384e003c4edeaf6b0d7e4dcf6f7eb4dd4fe65..c21c971b6eefd35a61365fc6c01c4150ae05117d 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleController.java @@ -30,7 +30,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -89,37 +88,33 @@ public class SysRoleController extends DefaultBaseController { } /** - * 批量停用角色 + * 停用角色 */ - @ApiOperation("批量停用角色") + @ApiOperation("停用角色") @HasPermission({"system:role:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "请选择需要停用的角色！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "角色ID不能为空！") String id) { - sysRoleService.batchUnable(ids); + sysRoleService.unable(id); - for (String id : ids) { - sysRoleService.cleanCacheByKey(id); - } + sysRoleService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用角色 + * 启用角色 */ - @ApiOperation("批量启用角色") + @ApiOperation("启用角色") @HasPermission({"system:role:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "请选择需要启用的角色！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "角色ID", required = true) @NotEmpty(message = "角色ID不能为空！") String id) { - sysRoleService.batchEnable(ids); + sysRoleService.enable(id); - for (String id : ids) { - sysRoleService.cleanCacheByKey(id); - } + sysRoleService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java similarity index 98% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java index 7babd7a4653ef3edd3de0a15179ea38e638ddf68..e3a41123f2b107a7cfab8a7ba1a9c3e7ba6e2307 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysRoleMenuController.java @@ -8,7 +8,7 @@ import com.lframework.xingyun.template.inner.service.SysModuleTenantService; import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.xingyun.template.inner.service.system.SysRoleMenuService; import com.lframework.xingyun.template.inner.vo.system.role.SysRoleMenuSettingVo; -import com.lframework.starter.web.common.tenant.TenantContextHolder; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysSiteMessageController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysSiteMessageController.java new file mode 100644 index 0000000000000000000000000000000000000000..346d970ccd199bbf3ae7daea0d2f77c9ad8907da --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysSiteMessageController.java @@ -0,0 +1,135 @@ +package com.lframework.xingyun.template.inner.controller.system; + +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.common.utils.ThreadUtil; +import com.lframework.starter.web.annotations.security.HasPermission; +import com.lframework.starter.web.components.security.SecurityUtil; +import com.lframework.starter.web.controller.DefaultBaseController; +import com.lframework.starter.web.resp.InvokeResult; +import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.threads.DefaultRunnable; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.template.inner.bo.system.message.site.GetSysSiteMessageBo; +import com.lframework.xingyun.template.inner.bo.system.message.site.QueryMySysSiteMessageBo; +import com.lframework.xingyun.template.inner.bo.system.message.site.QuerySysSiteMessageBo; +import com.lframework.xingyun.template.inner.dto.message.site.SiteMessageDto; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.service.system.SysSiteMessageService; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageByUserVo; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 站内信 Controller + * + * @author zmj + */ +@Api(tags = "站内信") +@Validated +@RestController +@RequestMapping("/system/message/site") +public class SysSiteMessageController extends DefaultBaseController { + + @Autowired + private SysSiteMessageService sysSiteMessageService; + + /** + * 查询列表 + */ + @ApiOperation("查询列表") + @HasPermission("system:site-message:manage") + @GetMapping("/query") + public InvokeResult> query(@Valid QuerySysSiteMessageVo vo) { + + PageResult pageResult = sysSiteMessageService.query(getPageIndex(vo), + getPageSize(vo), + vo); + + List datas = pageResult.getDatas(); + List results = null; + + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QuerySysSiteMessageBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 查询我的站内信 + */ + @ApiOperation("查询我的站内信") + @GetMapping("/query/my") + public InvokeResult> queryMySiteMessage( + @Valid QuerySysSiteMessageByUserVo vo) { + + vo.setUserId(SecurityUtil.getCurrentUser().getId()); + + PageResult pageResult = sysSiteMessageService.queryByUser(getPageIndex(vo), + getPageSize(vo), vo); + + List datas = pageResult.getDatas(); + List results = null; + + if (!CollectionUtil.isEmpty(datas)) { + results = datas.stream().map(QueryMySysSiteMessageBo::new).collect(Collectors.toList()); + } + + return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results)); + } + + /** + * 根据ID查询内容 + */ + @ApiOperation("根据ID查询内容") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @GetMapping("/content") + public InvokeResult getContent(@NotBlank(message = "id不能为空！") String id) { + + SiteMessageDto data = sysSiteMessageService.getContent(id); + if (data == null) { + throw new DefaultClientException("站内信不存在！"); + } + + String currentUserId = SecurityUtil.getCurrentUser().getId(); + ThreadUtil.execAsync(new DefaultRunnable(() -> { + if (sysSiteMessageService.setReaded(id)) { + sysSiteMessageService.noticeForWs(currentUserId); + } + })); + + return InvokeResultBuilder.success(data); + } + + /** + * 根据ID查询 + */ + @ApiOperation("根据ID查询") + @HasPermission("system:site-message:manage") + @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) + @GetMapping + public InvokeResult get(@NotBlank(message = "id不能为空！") String id) { + + SysSiteMessage data = sysSiteMessageService.findById(id); + if (data == null) { + throw new DefaultClientException("站内信不存在！"); + } + + GetSysSiteMessageBo result = new GetSysSiteMessageBo(data); + + return InvokeResultBuilder.success(result); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java similarity index 86% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java index 792112c2af53c65772594123e11eeb0c0b78d53b..5c0a3a5836e9b4027335d1cea288c96b99e878a3 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserController.java @@ -2,15 +2,15 @@ package com.lframework.xingyun.template.inner.controller.system; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.template.inner.bo.system.user.GetSysUserBo; import com.lframework.xingyun.template.inner.bo.system.user.QuerySysUserBo; -import com.lframework.xingyun.template.core.entity.SysUser; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.template.inner.service.system.SysUserService; import com.lframework.xingyun.template.inner.vo.system.user.CreateSysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.QuerySysUserVo; @@ -89,37 +89,33 @@ public class SysUserController extends DefaultBaseController { } /** - * 批量停用用户 + * 停用用户 */ - @ApiOperation("批量停用用户") + @ApiOperation("停用用户") @HasPermission({"system:user:modify"}) - @PatchMapping("/unable/batch") - public InvokeResult batchUnable( - @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "请选择需要停用的用户！") @RequestBody List ids) { + @PatchMapping("/unable") + public InvokeResult unable( + @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "用户ID不能为空！") String id) { - sysUserService.batchUnable(ids); + sysUserService.unable(id); - for (String id : ids) { - sysUserService.cleanCacheByKey(id); - } + sysUserService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } /** - * 批量启用用户 + * 启用用户 */ - @ApiOperation("批量启用用户") + @ApiOperation("启用用户") @HasPermission({"system:user:modify"}) - @PatchMapping("/enable/batch") - public InvokeResult batchEnable( - @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "请选择需要启用的用户！") @RequestBody List ids) { + @PatchMapping("/enable") + public InvokeResult enable( + @ApiParam(value = "用户ID", required = true) @NotEmpty(message = "用户ID不能为空！") String id) { - sysUserService.batchEnable(ids); + sysUserService.enable(id); - for (String id : ids) { - sysUserService.cleanCacheByKey(id); - } + sysUserService.cleanCacheByKey(id); return InvokeResultBuilder.success(); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserRoleController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserRoleController.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserRoleController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/SysUserRoleController.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java similarity index 97% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java index fc3659bcf7954a13e243306300f9a5c05305402f..82d0a46d26d2424046ca0133f29dc7d094bf1009 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/controller/system/TenantController.java @@ -13,8 +13,8 @@ import com.lframework.xingyun.template.inner.vo.system.tenant.QueryTenantVo; import com.lframework.xingyun.template.inner.vo.system.tenant.UpdateTenantVo; import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.starter.web.annotations.security.HasPermission; -import com.lframework.starter.web.common.event.ReloadTenantEvent; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.event.ReloadTenantEvent; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.controller.DefaultBaseController; import com.lframework.starter.web.resp.InvokeResult; import com.lframework.starter.web.resp.InvokeResultBuilder; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/LoginDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/MenuDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/MenuDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/MenuMetaDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuMetaDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/MenuMetaDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/MenuMetaDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/UserInfoDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/UserInfoDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/UserInfoDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/UserInfoDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/message/SysNoticeTaskDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/SysNoticeTaskDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/message/SysNoticeTaskDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/SysNoticeTaskDto.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/site/SiteMessageDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/site/SiteMessageDto.java new file mode 100644 index 0000000000000000000000000000000000000000..65e3b015bf0f2721b7075c9768ccbbebec0ad728 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/message/site/SiteMessageDto.java @@ -0,0 +1,34 @@ +package com.lframework.xingyun.template.inner.dto.message.site; + +import com.lframework.starter.web.bo.BaseBo; +import com.lframework.starter.web.dto.BaseDto; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; + +/** + * @author zmj + * @since 2022/8/18 + */ +@Data +public class SiteMessageDto extends BaseBo implements BaseDto, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 内容 + */ + @ApiModelProperty("内容") + private String content; + + public SiteMessageDto(SysSiteMessage dto) { + super(dto); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/qrtz/QrtzDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/qrtz/QrtzDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/qrtz/QrtzDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/qrtz/QrtzDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/QuerySysNoticeByUserDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/QuerySysNoticeByUserDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/QuerySysNoticeByUserDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/QuerySysNoticeByUserDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/SysNoticeDto.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/SysNoticeDto.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/SysNoticeDto.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/dto/system/notice/SysNoticeDto.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDic.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDic.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDic.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDic.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicCategory.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicCategory.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicCategory.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicCategory.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicItem.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicItem.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicItem.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataDicItem.java diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionData.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java similarity index 82% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionData.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java index aa27649919316c9bbe07ae612798004beb9916e9..e6c21623078ba7c30b3f9b810b6c329f4b9ae150 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionData.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionData.java @@ -1,9 +1,9 @@ -package com.lframework.xingyun.template.core.entity; +package com.lframework.xingyun.template.inner.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; -import com.lframework.xingyun.template.core.enums.SysDataPermissionDataBizType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionDataBizType; import lombok.Data; /** diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionModelDetail.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java similarity index 87% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionModelDetail.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java index 462dad94e498a0c17c06291a1862072f67619d6e..7d2213a94788f6c16e3d405b0a964f4a6a8ac6be 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysDataPermissionModelDetail.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDataPermissionModelDetail.java @@ -1,11 +1,11 @@ -package com.lframework.xingyun.template.core.entity; +package com.lframework.xingyun.template.inner.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailInputType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailInputType; import lombok.Data; /** diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDept.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDept.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysDept.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysDept.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysGenerateCode.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysGenerateCode.java new file mode 100644 index 0000000000000000000000000000000000000000..5a27ceccf22dcf9174b40cd2b032423127003641 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysGenerateCode.java @@ -0,0 +1,39 @@ +package com.lframework.xingyun.template.inner.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.entity.BaseEntity; +import lombok.Data; + +/** + *

+ * 编号规则 + *

+ * + * @author zmj + */ +@Data +@TableName("sys_generate_code") +public class SysGenerateCode extends BaseEntity implements BaseDto { + + public static final String CACHE_NAME = "SysGenerateCode"; + + private static final long serialVersionUID = 1L; + /** + * ID + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 名称 + */ + private String name; + + /** + * 配置信息（JSONArray） + */ + private String configStr; +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMailMessage.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMailMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..2db0fda933415363bdcb4be18000757fd1bbfabb --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMailMessage.java @@ -0,0 +1,92 @@ +package com.lframework.xingyun.template.inner.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.xingyun.template.inner.enums.system.SysMailMessageSendStatus; +import java.time.LocalDateTime; +import lombok.Data; + +/** + *

+ * 邮件消息 + *

+ * + * @author zmj + */ +@Data +@TableName("sys_mail_message") +public class SysMailMessage extends BaseEntity implements BaseDto { + + private static final long serialVersionUID = 1L; + + public static final String CACHE_NAME = "SysMailMessage"; + + /** + * ID + */ + private String id; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * 邮箱 + */ + private String mail; + + /** + * 业务键 + */ + private String bizKey; + + /** + * 发送状态 + */ + private SysMailMessageSendStatus sendStatus; + + /** + * 创建人ID 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private String createById; + + /** + * 创建人 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改人 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 修改人ID 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateById; + + /** + * 修改时间 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysMenu.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMenu.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysMenu.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysMenu.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModule.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysModuleTenant.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModuleTenant.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysModuleTenant.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysModuleTenant.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotice.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotice.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotice.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotice.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysNoticeLog.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNoticeLog.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysNoticeLog.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNoticeLog.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysPosition.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java similarity index 78% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysPosition.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java index 4345805a2c5ba4aa4e44128bd33f5a89c54a44ec..1c7d8524fc5a150dbc84cd6adab52d3ec9e7ffa2 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysPosition.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroup.java @@ -3,26 +3,26 @@ package com.lframework.xingyun.template.inner.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.entity.BaseEntity; +import com.lframework.xingyun.template.inner.enums.system.SysNotifyReceiverType; import java.time.LocalDateTime; import lombok.Data; /** *

- * 系统岗位 + * 消息通知组 *

* * @author zmj - * @since 2021-07-01 */ @Data -@TableName("sys_position") -public class SysPosition extends BaseEntity implements BaseDto { +@TableName("sys_notify_group") +public class SysNotifyGroup extends BaseEntity implements BaseDto { private static final long serialVersionUID = 1L; - public static final String CACHE_NAME = "SysPosition"; + public static final String CACHE_NAME = "SysNotifyGroup"; /** * ID @@ -30,14 +30,19 @@ public class SysPosition extends BaseEntity implements BaseDto { private String id; /** - * 岗位编号 + * 名称 */ - private String code; + private String name; /** - * 岗位名称 + * 接收者类型 */ - private String name; + private SysNotifyReceiverType receiverType; + + /** + * 消息类型 + */ + private String messageType; /** * 状态 diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserPosition.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java similarity index 61% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserPosition.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java index a43377063e0b2532cede9b0ceec9fc572bfe1645..bec82e9856835ad3236a53254f3326b49789c625 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserPosition.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysNotifyGroupReceiver.java @@ -1,21 +1,20 @@ package com.lframework.xingyun.template.inner.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.entity.BaseEntity; import lombok.Data; /** *

- * + * 消息通知组-接收者关系表 *

* * @author zmj - * @since 2021-07-04 */ @Data -@TableName("sys_user_position") -public class SysUserPosition extends BaseEntity implements BaseDto { +@TableName("sys_notify_group_receiver") +public class SysNotifyGroupReceiver extends BaseEntity implements BaseDto { private static final long serialVersionUID = 1L; @@ -25,12 +24,12 @@ public class SysUserPosition extends BaseEntity implements BaseDto { private String id; /** - * 用户ID + * 消息通知组ID */ - private String userId; + private String groupId; /** - * 岗位ID + * 接收者ID */ - private String positionId; + private String receiverId; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysOpenDomain.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysOpenDomain.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysOpenDomain.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysOpenDomain.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysParameter.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysParameter.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysParameter.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysParameter.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysRole.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRole.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysRole.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRole.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysRoleMenu.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysSiteMessage.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysSiteMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..7cc5b23ebd0a675d74d0c36b5d468caa308ed523 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysSiteMessage.java @@ -0,0 +1,96 @@ +package com.lframework.xingyun.template.inner.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.lframework.starter.web.dto.BaseDto; +import com.lframework.starter.web.entity.BaseEntity; +import java.time.LocalDateTime; +import lombok.Data; + +/** + *

+ * 站内信 + *

+ * + * @author zmj + */ +@Data +@TableName("sys_site_message") +public class SysSiteMessage extends BaseEntity implements BaseDto { + + private static final long serialVersionUID = 1L; + + public static final String CACHE_NAME = "SysSiteMessage"; + + /** + * ID + */ + private String id; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * 接收人ID + */ + private String receiverId; + + /** + * 业务键 + */ + private String bizKey; + + /** + * 是否已读 + */ + private Boolean readed; + + /** + * 已读时间 + */ + private LocalDateTime readTime; + + /** + * 创建人ID 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private String createById; + + /** + * 创建人 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 新增时赋值 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改人 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 修改人ID 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateById; + + /** + * 修改时间 新增和修改时赋值 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; +} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysUser.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java similarity index 94% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysUser.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java index c90dead10342bbde7f6e65b399347e4ba4f3f772..9361b441fcc4ce983021a31ee37cb6fe560f3923 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/entity/SysUser.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUser.java @@ -1,11 +1,11 @@ -package com.lframework.xingyun.template.core.entity; +package com.lframework.xingyun.template.inner.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.lframework.starter.web.entity.BaseEntity; import com.lframework.starter.web.dto.BaseDto; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import java.time.LocalDateTime; import lombok.Data; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserDept.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserDept.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserDept.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserDept.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserRole.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserTelephone.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserTelephone.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserTelephone.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/SysUserTelephone.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/Tenant.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/Tenant.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/entity/Tenant.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/entity/Tenant.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/QrtzJobType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/QrtzJobType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/QrtzJobType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/QrtzJobType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/TriggerState.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/TriggerState.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/TriggerState.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/TriggerState.java diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionDataBizType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java similarity index 90% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionDataBizType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java index a4897c8ae81766d07ee83d9af57a05f265710c19..42c67e4735ebcb8e92d113a1be0e4260af62c645 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionDataBizType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionDataBizType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailCalcType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java similarity index 92% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailCalcType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java index 13c070fbfd90e4fcb8601adfb62efed561bc71fe..593cc836b6723842c27f23663439045f17ae6c96 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailCalcType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailCalcType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailConditionType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java similarity index 94% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailConditionType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java index bb8b0a45f1f9bbac832be909896f21bd0d91ca86..53fe526a990b37f4fc4214de9e4228771018827d 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailConditionType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailConditionType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailInputType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java similarity index 91% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailInputType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java index b9f1b1e66a027cb2f5d20734fb6393a68e76de23..1479ca19cdd9aa8aa0b9ce8f0e2cb5c93ed96acb 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailInputType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailInputType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailNodeType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java similarity index 90% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailNodeType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java index 507b2ce49d79b00c7edde2eac6cd58ff46933952..cd2f3f0df6abcf65ae22264bd9f6fef21f27b86d 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/enums/SysDataPermissionModelDetailNodeType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDataPermissionModelDetailNodeType.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java index 179f7e85dead5b960c2828189538625a2b61296b..808b43c87756032e6324b63ccaf20bbce04b241e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysDeptNodeType.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.template.inner.enums.system; -import com.lframework.xingyun.template.core.enums.NodeType; +import com.lframework.xingyun.core.enums.NodeType; import java.io.Serializable; import org.springframework.stereotype.Component; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMailMessageSendStatus.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMailMessageSendStatus.java new file mode 100644 index 0000000000000000000000000000000000000000..3f5685697aa4a5541765613936f17367186963b6 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMailMessageSendStatus.java @@ -0,0 +1,32 @@ +package com.lframework.xingyun.template.inner.enums.system; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.lframework.starter.web.enums.BaseEnum; + +public enum SysMailMessageSendStatus implements BaseEnum { + + UN_SEND(0, "待发送"), SENDING(1, "发送中"), SENDED(2, "已发送"), FAIL(9, "发送失败"); + + @EnumValue + private final Integer code; + + private final String desc; + + SysMailMessageSendStatus(Integer code, String desc) { + + this.code = code; + this.desc = desc; + } + + @Override + public Integer getCode() { + + return this.code; + } + + @Override + public String getDesc() { + + return this.desc; + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuComponentType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuComponentType.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuComponentType.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuComponentType.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuDisplay.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuDisplay.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuDisplay.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysMenuDisplay.java diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockCostAdjustSheetStatus.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java similarity index 49% rename from xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockCostAdjustSheetStatus.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java index f24c7253d00aa824f8b46a3b341e59b2dba144fa..ec24ef1663e76e475748dbba717b07bcf54ada53 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/enums/StockCostAdjustSheetStatus.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyMessageType.java @@ -1,17 +1,18 @@ -package com.lframework.xingyun.sc.enums; +package com.lframework.xingyun.template.inner.enums.system; import com.baomidou.mybatisplus.annotation.EnumValue; import com.lframework.starter.web.enums.BaseEnum; -public enum StockCostAdjustSheetStatus implements BaseEnum { - CREATED(0, "待审核"), APPROVE_PASS(3, "审核通过"), APPROVE_REFUSE(6, "审核拒绝"); +public enum SysNotifyMessageType implements BaseEnum { + + SYS(0, "站内信"), EMAIL(1, "邮件"); @EnumValue - private Integer code; + private final Integer code; - private String desc; + private final String desc; - StockCostAdjustSheetStatus(Integer code, String desc) { + SysNotifyMessageType(Integer code, String desc) { this.code = code; this.desc = desc; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyReceiverType.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyReceiverType.java new file mode 100644 index 0000000000000000000000000000000000000000..817944f71aa152cf85247fae3377b134d4bbbf84 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/enums/system/SysNotifyReceiverType.java @@ -0,0 +1,32 @@ +package com.lframework.xingyun.template.inner.enums.system; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.lframework.starter.web.enums.BaseEnum; + +public enum SysNotifyReceiverType implements BaseEnum { + + DEPT(0, "部门及其子部门"), USER(1, "用户"), ROLE(2, "角色"); + + @EnumValue + private final Integer code; + + private final String desc; + + SysNotifyReceiverType(Integer code, String desc) { + + this.code = code; + this.desc = desc; + } + + @Override + public Integer getCode() { + + return this.code; + } + + @Override + public String getDesc() { + + return this.desc; + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java similarity index 92% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java index 85b224c3dab6c71e800210b9482a9951ae22809e..9798de08d71e514ad3482c191618519095b9c38c 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/AbstractUserDetailsService.java @@ -2,9 +2,9 @@ package com.lframework.xingyun.template.inner.impl; import com.lframework.starter.common.exceptions.impl.UserLoginException; import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityConstants; -import com.lframework.starter.web.common.tenant.TenantContextHolder; +import com.lframework.starter.web.components.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.SecurityConstants; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import com.lframework.starter.web.components.security.UserDetailsService; import com.lframework.starter.web.utils.RequestUtil; import com.lframework.starter.web.utils.TenantUtil; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java similarity index 99% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java index 50079bec301bf82f994febb9c99070845987ccc9..d5fe19fdeb018f386408b5a39a6622d32b76dd3a 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/QrtzServiceImpl.java @@ -13,7 +13,7 @@ import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.core.components.qrtz.QrtzHandler; +import com.lframework.xingyun.core.components.qrtz.QrtzHandler; import com.lframework.xingyun.template.inner.components.qrtz.DynamicQrtzJob; import com.lframework.xingyun.template.inner.dto.qrtz.QrtzDto; import com.lframework.xingyun.template.inner.enums.QrtzJobType; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleTenantServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleTenantServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleTenantServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/SysModuleTenantServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java index 4b7ee035ac3cfc1c91ea78d66a1ed61efd235834..96b757a86fcbcc4f8bee25ab4b1455d1ada9c2c0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/TenantServiceImpl.java @@ -1,6 +1,7 @@ package com.lframework.xingyun.template.inner.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageInfo; @@ -8,17 +9,17 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.EncryptUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; import com.lframework.xingyun.template.inner.entity.Tenant; +import com.lframework.xingyun.template.inner.mappers.TenantMapper; import com.lframework.xingyun.template.inner.service.TenantService; import com.lframework.xingyun.template.inner.vo.system.tenant.CreateTenantVo; import com.lframework.xingyun.template.inner.vo.system.tenant.QueryTenantVo; import com.lframework.xingyun.template.inner.vo.system.tenant.TenantSelectorVo; import com.lframework.xingyun.template.inner.vo.system.tenant.UpdateTenantVo; -import com.lframework.xingyun.template.inner.mappers.TenantMapper; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; import java.io.Serializable; import java.util.List; import org.springframework.cache.annotation.CacheEvict; @@ -63,6 +64,11 @@ public class TenantServiceImpl extends BaseMpServiceImpl i @Override public Integer create(CreateTenantVo data) { + Wrapper checkWrapper = Wrappers.lambdaQuery(Tenant.class) + .eq(Tenant::getName, data.getName()); + if (count(checkWrapper) > 0) { + throw new DefaultClientException("名称重复，请重新输入！"); + } Tenant record = new Tenant(); record.setName(data.getName()); record.setJdbcUrl(data.getJdbcUrl()); @@ -84,6 +90,12 @@ public class TenantServiceImpl extends BaseMpServiceImpl i throw new DefaultClientException("租户不存在！"); } + Wrapper checkWrapper = Wrappers.lambdaQuery(Tenant.class) + .eq(Tenant::getName, data.getName()).ne(Tenant::getId, data.getId()); + if (count(checkWrapper) > 0) { + throw new DefaultClientException("名称重复，请重新输入！"); + } + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(Tenant.class) .eq(Tenant::getId, data.getId()).set(Tenant::getName, data.getName()) .set(Tenant::getAvailable, data.getAvailable()); diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java index c4e9621beb86b738fecc2586d8f2ef9c0a4bf531..2d543ec2a7afd3c35cdacb0a586cbe63d4720f77 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/UserDetailsService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.impl; import com.lframework.xingyun.template.inner.mappers.UserDetailsMapper; -import com.lframework.starter.web.common.security.AbstractUserDetails; +import com.lframework.starter.web.components.security.AbstractUserDetails; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicCategoryServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicCategoryServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicCategoryServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicCategoryServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicItemServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataDicServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java index 58e77032dfdc2b6d08631dcbcf620da2ca7ee0af..689f36ba7b99cf38759279c2354a38ecb7fd9d38 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionDataServiceImpl.java @@ -2,7 +2,7 @@ package com.lframework.xingyun.template.inner.impl.system; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.xingyun.template.inner.mappers.system.SysDataPermissionDataMapper; import com.lframework.xingyun.template.inner.service.system.SysDataPermissionDataService; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/SysDataPermissionModelDetailServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java similarity index 87% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/SysDataPermissionModelDetailServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java index 9734d1a20e2e9b11bcd405d6519181d36c30a8a0..8f680a13ff05e3bfd30effd99cf5fbda887e0449 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/SysDataPermissionModelDetailServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDataPermissionModelDetailServiceImpl.java @@ -1,18 +1,18 @@ -package com.lframework.xingyun.template.core.impl; +package com.lframework.xingyun.template.inner.impl.system; import com.lframework.starter.common.exceptions.impl.DefaultSysException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.xingyun.template.core.vo.permission.SysDataPermissionModelDetailVo; -import com.lframework.xingyun.template.core.entity.SysDataPermissionModelDetail; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailCalcType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailConditionType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailInputType; -import com.lframework.xingyun.template.core.enums.SysDataPermissionModelDetailNodeType; -import com.lframework.xingyun.template.core.mappers.SysDataPermissionModelDetailMapper; -import com.lframework.xingyun.template.core.service.SysDataPermissionModelDetailService; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailCalcType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailConditionType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailInputType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionModelDetailNodeType; +import com.lframework.xingyun.template.inner.mappers.system.SysDataPermissionModelDetailMapper; +import com.lframework.xingyun.template.inner.service.system.SysDataPermissionModelDetailService; +import com.lframework.xingyun.template.inner.vo.system.permission.SysDataPermissionModelDetailVo; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java similarity index 83% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java index 20565b3a8ac59125bceb718614af24b88778a385..7a6bd6613ffd0880f11653a5024b2417107a6977 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysDeptServiceImpl.java @@ -8,19 +8,18 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.common.utils.ApplicationUtil; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.service.DeptService; -import com.lframework.xingyun.template.core.service.RecursionMappingService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.inner.entity.SysDept; import com.lframework.xingyun.template.inner.enums.system.SysDeptNodeType; -import com.lframework.xingyun.template.inner.vo.system.dept.CreateSysDeptVo; -import com.lframework.xingyun.template.inner.vo.system.dept.UpdateSysDeptVo; import com.lframework.xingyun.template.inner.mappers.system.SysDeptMapper; import com.lframework.xingyun.template.inner.service.system.SysDeptService; +import com.lframework.xingyun.template.inner.vo.system.dept.CreateSysDeptVo; +import com.lframework.xingyun.template.inner.vo.system.dept.UpdateSysDeptVo; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -39,9 +38,6 @@ public class SysDeptServiceImpl extends BaseMpServiceImpl selector() { @@ -55,57 +51,46 @@ public class SysDeptServiceImpl extends BaseMpServiceImpl ids) { + public SysDept findByCode(String code) { + Wrapper queryWrapper = Wrappers.lambdaQuery(SysDept.class).eq(SysDept::getCode, code); + return getOne(queryWrapper); + } - if (CollectionUtil.isEmpty(ids)) { - return; - } + @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用部门，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void unable(String id) { List batchIds = new ArrayList<>(); - for (String id : ids) { - List nodeChildIds = recursionMappingService.getNodeChildIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - if (CollectionUtil.isEmpty(nodeChildIds)) { - continue; - } - + batchIds.add(id); + List nodeChildIds = recursionMappingService.getNodeChildIds(id, + ApplicationUtil.getBean(SysDeptNodeType.class)); + if (CollectionUtil.isNotEmpty(nodeChildIds)) { batchIds.addAll(nodeChildIds); } - batchIds.addAll(ids); - this.doBatchUnable(batchIds); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用部门，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用部门，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { List batchIds = new ArrayList<>(); - for (String id : ids) { - List nodeChildIds = recursionMappingService.getNodeParentIds(id, - ApplicationUtil.getBean(SysDeptNodeType.class)); - if (CollectionUtil.isEmpty(nodeChildIds)) { - continue; - } - + batchIds.add(id); + List nodeChildIds = recursionMappingService.getNodeParentIds(id, + ApplicationUtil.getBean(SysDeptNodeType.class)); + if (CollectionUtil.isNotEmpty(nodeChildIds)) { batchIds.addAll(nodeChildIds); } - batchIds.addAll(ids); - this.doBatchEnable(batchIds); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增部门，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增部门，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSysDeptVo vo) { @@ -121,7 +106,8 @@ public class SysDeptServiceImpl extends BaseMpServiceImpl implements SysGenerateCodeService { + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySysGenerateCodeVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QuerySysGenerateCodeVo vo) { + + return getBaseMapper().query(vo); + } + + @Cacheable(value = SysGenerateCode.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") + @Override + public SysGenerateCode findById(Integer id) { + + return getBaseMapper().selectById(id); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增编号规则，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public Integer create(CreateSysGenerateCodeVo vo) { + + Wrapper checkWrapper = Wrappers.lambdaQuery(SysGenerateCode.class) + .eq(SysGenerateCode::getId, vo.getId()); + if (this.count(checkWrapper) > 0) { + throw new DefaultClientException("规则ID重复，请重新输入！"); + } + SysGenerateCode data = new SysGenerateCode(); + data.setId(vo.getId()); + data.setName(vo.getName()); + data.setConfigStr(StringPool.EMPTY_STR); + + getBaseMapper().insert(data); + + OpLogUtil.setVariable("id", String.valueOf(data.getId())); + OpLogUtil.setExtra(vo); + + return data.getId(); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "修改编号规则，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSysGenerateCodeVo vo) { + + SysGenerateCode data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("编号规则不存在！"); + } + + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate( + SysGenerateCode.class) + .set(SysGenerateCode::getName, vo.getName()) + .eq(SysGenerateCode::getId, vo.getId()); + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", String.valueOf(data.getId())); + OpLogUtil.setExtra(vo); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "删除编号规则，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteById(Integer id) { + + getBaseMapper().deleteById(id); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "设置编号规则，ID：{}", params = {"#id"}) + @Transactional(rollbackFor = Exception.class) + @Override + public void setting(SettingSysGenerateCodeVo vo) { + SysGenerateCode data = getBaseMapper().selectById(vo.getId()); + if (ObjectUtil.isNull(data)) { + throw new DefaultClientException("编号规则不存在！"); + } + + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate( + SysGenerateCode.class) + .set(SysGenerateCode::getConfigStr, vo.getConfigStr()) + .eq(SysGenerateCode::getId, vo.getId()); + + getBaseMapper().update(updateWrapper); + + OpLogUtil.setVariable("id", String.valueOf(data.getId())); + OpLogUtil.setExtra(vo); + } + + @CacheEvict(value = {SysGenerateCode.CACHE_NAME, + GenerateCodeDto.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") + @Override + public void cleanCacheByKey(Serializable key) { + + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMailMessageServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMailMessageServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..8a7c32ac692aee073cb920c9eec4d141b08f6f48 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMailMessageServiceImpl.java @@ -0,0 +1,43 @@ +package com.lframework.xingyun.template.inner.impl.system; + +import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; +import com.lframework.xingyun.template.inner.mappers.system.SysMailMessageMapper; +import com.lframework.xingyun.template.inner.service.system.SysMailMessageService; +import com.lframework.xingyun.template.inner.vo.system.message.mail.QuerySysMailMessageVo; +import java.util.Collections; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class SysMailMessageServiceImpl extends + BaseMpServiceImpl + implements SysMailMessageService { + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySysMailMessageVo vo) { + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QuerySysMailMessageVo vo) { + return getBaseMapper().query(vo); + } + + @Override + public SysMailMessage findById(String id) { + return getById(id); + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java similarity index 88% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java index 299d8f77eb4b7f4d35d0667828b5457f7072d022..76522a5735ffd03302a17954ab6ee539666ef84b 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysMenuServiceImpl.java @@ -8,32 +8,34 @@ import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.common.security.SecurityConstants; -import com.lframework.starter.web.common.utils.ApplicationUtil; import com.lframework.starter.web.components.security.IUserTokenResolver; +import com.lframework.starter.web.components.security.SecurityConstants; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.utils.ApplicationUtil; import com.lframework.starter.web.utils.EnumUtil; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.SpelUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.inner.dto.MenuDto; +import com.lframework.xingyun.template.inner.entity.SysMenu; import com.lframework.xingyun.template.inner.enums.system.SysMenuComponentType; import com.lframework.xingyun.template.inner.enums.system.SysMenuDisplay; +import com.lframework.xingyun.template.inner.mappers.system.SysMenuMapper; +import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.xingyun.template.inner.vo.system.menu.CreateSysMenuVo; import com.lframework.xingyun.template.inner.vo.system.menu.SysMenuSelectorVo; import com.lframework.xingyun.template.inner.vo.system.menu.UpdateSysMenuVo; -import com.lframework.xingyun.template.inner.mappers.system.SysMenuMapper; -import com.lframework.xingyun.template.inner.entity.SysMenu; -import com.lframework.xingyun.template.inner.service.system.SysMenuService; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; +import java.util.stream.Collectors; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -77,7 +79,8 @@ public class SysMenuServiceImpl extends BaseMpServiceImpl ids, @NonNull String userId) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(@NonNull String id) { - this.doBatchEnable(ids, userId); + this.doEnable(id); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用菜单，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用菜单，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(@NonNull List ids, @NonNull String userId) { + public void unable(@NonNull String id) { - if (CollectionUtil.isEmpty(ids)) { - return; - } - - this.doBatchUnable(ids, userId); + this.doUnable(id); } @Override @@ -222,14 +218,48 @@ public class SysMenuServiceImpl extends BaseMpServiceImpl ids, @NonNull String userId) { + protected void doEnable(@NonNull String id) { + + List ids = new ArrayList<>(); + // 启用时，需要将父级菜单也启用 + ids.add(id); + + String tmpId = id; + while (!StringUtil.isBlank(tmpId)) { + SysMenu sysMenu = getById(tmpId); + if (sysMenu == null) { + break; + } + if (StringUtil.isBlank(sysMenu.getParentId())) { + break; + } + + ids.add(sysMenu.getParentId()); + tmpId = sysMenu.getParentId(); + } Wrapper wrapper = Wrappers.lambdaUpdate(SysMenu.class) .set(SysMenu::getAvailable, Boolean.TRUE).in(SysMenu::getId, ids); getBaseMapper().update(new SysMenu(), wrapper); } - protected void doBatchUnable(@NonNull List ids, @NonNull String userId) { + protected void doUnable(@NonNull String id) { + + Set ids = new HashSet<>(); + // 停用时，需要将子级菜单也停用 + ids.add(id); + while (true) { + List sysMenuList = list(Wrappers.lambdaQuery(SysMenu.class) + .in(SysMenu::getParentId, ids)); + + int oldSize = ids.size(); + if (CollectionUtil.isNotEmpty(sysMenuList)) { + ids.addAll(sysMenuList.stream().map(SysMenu::getId).collect(Collectors.toList())); + } + if (oldSize == ids.size()) { + break; + } + } Wrapper wrapper = Wrappers.lambdaUpdate(SysMenu.class) .set(SysMenu::getAvailable, Boolean.FALSE).in(SysMenu::getId, ids); @@ -253,7 +283,7 @@ public class SysMenuServiceImpl extends BaseMpServiceImpl getPermissionsByUserId(String userId, boolean isAdmin, List moduleIds) { + public Set getPermissionsByUserId(String userId, boolean isAdmin, + List moduleIds) { return getBaseMapper().getPermissionsByUserId(userId, isAdmin, moduleIds); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeLogServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java similarity index 96% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java index 6c1f96638212caa4de93ce02e23bfa4a8d7b2a57..06399f306eda07fc7ff7406f446ba30a16a8e304 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNoticeServiceImpl.java @@ -13,15 +13,15 @@ import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.threads.DefaultRunnable; +import com.lframework.starter.web.threads.DefaultRunnable; import com.lframework.starter.web.dto.WsPushData; import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.websocket.components.WsDataPusher; import com.lframework.starter.websocket.events.UserConnectEvent; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.entity.SysUser; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.inner.dto.system.notice.QuerySysNoticeByUserDto; import com.lframework.xingyun.template.inner.dto.system.notice.SysNoticeDto; import com.lframework.xingyun.template.inner.entity.SysNotice; diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupReceiverServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupReceiverServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..33740931049fce6511c3f2afd22dbcfd081ef097 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupReceiverServiceImpl.java @@ -0,0 +1,26 @@ +package com.lframework.xingyun.template.inner.impl.system; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroupReceiver; +import com.lframework.xingyun.template.inner.mappers.system.SysNotifyGroupReceiverMapper; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupReceiverService; +import java.util.List; +import java.util.stream.Collectors; +import org.springframework.stereotype.Service; + +@Service +public class SysNotifyGroupReceiverServiceImpl extends + BaseMpServiceImpl + implements SysNotifyGroupReceiverService { + + @Override + public List getReceiverIdsByGroupId(String groupId) { + Wrapper queryWrapper = Wrappers.lambdaQuery( + SysNotifyGroupReceiver.class).select(SysNotifyGroupReceiver::getReceiverId) + .eq(SysNotifyGroupReceiver::getGroupId, groupId); + return this.list(queryWrapper).stream().map(SysNotifyGroupReceiver::getReceiverId) + .collect(Collectors.toList()); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b948d97261c93e0233bea04fe2bbbe355681bded --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysNotifyGroupServiceImpl.java @@ -0,0 +1,251 @@ +package com.lframework.xingyun.template.inner.impl.system; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.common.exceptions.impl.DefaultClientException; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.service.RecursionMappingService; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroupReceiver; +import com.lframework.xingyun.template.inner.entity.SysUserDept; +import com.lframework.xingyun.template.inner.entity.SysUserRole; +import com.lframework.xingyun.template.inner.enums.system.SysDeptNodeType; +import com.lframework.xingyun.template.inner.enums.system.SysNotifyReceiverType; +import com.lframework.xingyun.template.inner.mappers.system.SysNotifyGroupMapper; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupReceiverService; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupService; +import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; +import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; +import com.lframework.xingyun.template.inner.vo.system.notify.CreateSysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.QuerySysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.SysNotifyGroupSelectorVo; +import com.lframework.xingyun.template.inner.vo.system.notify.UpdateSysNotifyGroupVo; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class SysNotifyGroupServiceImpl extends + BaseMpServiceImpl implements + SysNotifyGroupService { + + @Autowired + private SysNotifyGroupReceiverService sysNotifyGroupReceiverService; + + @Autowired + private RecursionMappingService recursionMappingService; + + @Autowired + private SysUserDeptService sysUserDeptService; + + @Autowired + private SysUserRoleService sysUserRoleService; + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySysNotifyGroupVo vo) { + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QuerySysNotifyGroupVo vo) { + return getBaseMapper().query(vo); + } + + @Cacheable(value = SysNotifyGroup.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") + @Override + public SysNotifyGroup findById(String id) { + return this.getById(id); + } + + @Override + public PageResult selector(Integer pageIndex, Integer pageSize, + SysNotifyGroupSelectorVo vo) { + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = getBaseMapper().selector(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "创建消息通知组，ID：{}", params = "#_result", autoSaveParams = true) + @Transactional(rollbackFor = Exception.class) + @Override + public String create(CreateSysNotifyGroupVo vo) { + + Wrapper checkWrapper = Wrappers.lambdaQuery(SysNotifyGroup.class) + .eq(SysNotifyGroup::getName, vo.getName()); + if (this.count(checkWrapper) > 0) { + throw new DefaultClientException("名称不允许重复！"); + } + + SysNotifyGroup record = new SysNotifyGroup(); + record.setId(IdUtil.getId()); + record.setName(vo.getName()); + record.setReceiverType(EnumUtil.getByCode(SysNotifyReceiverType.class, vo.getReceiverType())); + record.setMessageType(StringUtil.join(StringPool.STR_SPLIT, vo.getMessageType())); + record.setAvailable(Boolean.TRUE); + record.setDescription( + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); + + this.save(record); + + List receiverList = vo.getReceiverIds().stream().map(t -> { + SysNotifyGroupReceiver r = new SysNotifyGroupReceiver(); + r.setId(IdUtil.getId()); + r.setGroupId(record.getId()); + r.setReceiverId(t); + + return r; + }).collect(Collectors.toList()); + + sysNotifyGroupReceiverService.saveBatch(receiverList); + + return record.getId(); + } + + @OpLog(type = DefaultOpLogType.SYSTEM, name = "修改消息通知组，ID：{}", params = "#vo.id", autoSaveParams = true) + @Transactional(rollbackFor = Exception.class) + @Override + public void update(UpdateSysNotifyGroupVo vo) { + + SysNotifyGroup record = this.getById(vo.getId()); + if (record == null) { + throw new DefaultClientException("消息通知组不存在！"); + } + + Wrapper checkWrapper = Wrappers.lambdaQuery(SysNotifyGroup.class) + .eq(SysNotifyGroup::getName, vo.getName()) + .ne(SysNotifyGroup::getId, record.getId()); + if (this.count(checkWrapper) > 0) { + throw new DefaultClientException("名称不允许重复！"); + } + + Wrapper updateWrapper = Wrappers.lambdaUpdate(SysNotifyGroup.class) + .eq(SysNotifyGroup::getId, vo.getId()) + .set(SysNotifyGroup::getName, vo.getName()) + .set(SysNotifyGroup::getDescription, + StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) + .set(SysNotifyGroup::getReceiverType, + EnumUtil.getByCode(SysNotifyReceiverType.class, vo.getReceiverType())) + .set(SysNotifyGroup::getMessageType, + StringUtil.join(StringPool.STR_SPLIT, vo.getMessageType())) + .set(SysNotifyGroup::getAvailable, vo.getAvailable()); + this.update(updateWrapper); + + Wrapper deleteReceiverWrapper = Wrappers.lambdaQuery( + SysNotifyGroupReceiver.class).eq(SysNotifyGroupReceiver::getGroupId, record.getId()); + sysNotifyGroupReceiverService.remove(deleteReceiverWrapper); + + List receiverList = vo.getReceiverIds().stream().map(t -> { + SysNotifyGroupReceiver r = new SysNotifyGroupReceiver(); + r.setId(IdUtil.getId()); + r.setGroupId(record.getId()); + r.setReceiverId(t); + + return r; + }).collect(Collectors.toList()); + + sysNotifyGroupReceiverService.saveBatch(receiverList); + } + + @Override + public Set getReceiveUserIds(String id) { + SysNotifyGroupService thisService = ApplicationUtil.getBean(SysNotifyGroupService.class); + SysNotifyGroup notifyGroup = thisService.findById(id); + if (notifyGroup == null) { + throw new DefaultClientException("消息通知组不存在！"); + } + if (!notifyGroup.getAvailable()) { + return Collections.emptySet(); + } + + Set userIds = new HashSet<>(); + switch (notifyGroup.getReceiverType()) { + case USER: { + List receiverIds = sysNotifyGroupReceiverService.getReceiverIdsByGroupId( + notifyGroup.getId()); + userIds.addAll(receiverIds); + break; + } + + case DEPT: { + List deptIds = sysNotifyGroupReceiverService.getReceiverIdsByGroupId( + notifyGroup.getId()); + List allDeptIds = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(deptIds)) { + for (String deptId : deptIds) { + List childDeptIds = recursionMappingService.getNodeChildIds(deptId, + ApplicationUtil.getBean(SysDeptNodeType.class)); + allDeptIds.addAll(childDeptIds); + } + allDeptIds.addAll(deptIds); + } + + if (CollectionUtil.isNotEmpty(allDeptIds)) { + Wrapper queryWrapper = Wrappers.lambdaQuery(SysUserDept.class) + .select(SysUserDept::getUserId) + .in(SysUserDept::getDeptId, allDeptIds); + List sysUserDeptList = sysUserDeptService.list(queryWrapper); + userIds.addAll( + sysUserDeptList.stream().map(SysUserDept::getUserId).collect(Collectors.toList())); + } + + break; + } + + case ROLE: { + List roleIds = sysNotifyGroupReceiverService.getReceiverIdsByGroupId( + notifyGroup.getId()); + if (CollectionUtil.isNotEmpty(roleIds)) { + Wrapper queryWrapper = Wrappers.lambdaQuery(SysUserRole.class) + .select(SysUserRole::getUserId) + .in(SysUserRole::getRoleId, roleIds); + List sysUserRoleList = sysUserRoleService.list(queryWrapper); + userIds.addAll( + sysUserRoleList.stream().map(SysUserRole::getUserId).collect(Collectors.toList())); + } + + break; + } + default: + throw new DefaultClientException("消息通知组接收者类型错误！"); + } + + return userIds; + } + + @CacheEvict(value = SysNotifyGroup.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") + @Override + public void cleanCacheByKey(Serializable key) { + + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysOpenDomainServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysOpenDomainServiceImpl.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysOpenDomainServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysOpenDomainServiceImpl.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java index e279c0642005f8d11d901e567512348456237767..7ae93dcb56e9c66ab21553b80f0de2ec4a5984d5 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysParameterServiceImpl.java @@ -11,17 +11,18 @@ import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.SysConfService; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.template.inner.entity.SysParameter; import com.lframework.xingyun.template.inner.vo.system.parameter.CreateSysParameterVo; import com.lframework.xingyun.template.inner.vo.system.parameter.QuerySysParameterVo; import com.lframework.xingyun.template.inner.vo.system.parameter.UpdateSysParameterVo; import com.lframework.xingyun.template.inner.mappers.system.SysParameterMapper; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.enums.DefaultOpLogType; import com.lframework.xingyun.template.inner.service.system.SysParameterService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.utils.OpLogUtil; import java.io.Serializable; import java.util.List; import org.springframework.cache.annotation.CacheEvict; @@ -32,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SysParameterServiceImpl extends BaseMpServiceImpl implements SysParameterService, - com.lframework.starter.web.service.SysParameterService { + SysConfService { @Override public PageResult query(Integer pageIndex, Integer pageSize, @@ -73,7 +74,7 @@ public class SysParameterServiceImpl extends @Override public String findRequiredByKey(String key) throws ParameterNotFoundException { - com.lframework.starter.web.service.SysParameterService thisService = getThis(this.getClass()); + SysConfService thisService = getThis(this.getClass()); String data = thisService.findByKey(key); if (data == null) { throw new ParameterNotFoundException(); @@ -84,7 +85,7 @@ public class SysParameterServiceImpl extends @Override public String findByKey(String key, String defaultValue) { - com.lframework.starter.web.service.SysParameterService thisService = getThis(this.getClass()); + SysConfService thisService = getThis(this.getClass()); String data = thisService.findByKey(key); if (data == null) { return defaultValue; @@ -152,7 +153,7 @@ public class SysParameterServiceImpl extends @Override public Boolean getBoolean(String key) { - com.lframework.starter.web.service.SysParameterService thisService = getThis(getClass()); + SysConfService thisService = getThis(getClass()); String value = thisService.findByKey(key); return value == null ? null : "true".equalsIgnoreCase(value); } @@ -169,7 +170,7 @@ public class SysParameterServiceImpl extends @Override public Integer getInteger(String key) { - com.lframework.starter.web.service.SysParameterService thisService = getThis(getClass()); + SysConfService thisService = getThis(getClass()); String value = thisService.findByKey(key); try { return value == null ? null : Integer.valueOf(value); diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java index 610e0c59105ca1a659ac32f0a0fe86727dd98bca..4e7df1ac54944ae68a32736755833c17d733ba21 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleMenuServiceImpl.java @@ -6,10 +6,10 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.common.security.SecurityConstants; +import com.lframework.starter.web.components.security.SecurityConstants; import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; import com.lframework.xingyun.template.inner.entity.SysRoleMenu; import com.lframework.xingyun.template.inner.mappers.system.SysRoleMenuMapper; import com.lframework.xingyun.template.inner.entity.SysRole; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java similarity index 82% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java index c0241ee0cc183cea5215c7a27df0b8b6cf6ab724..2eb2d832a8c7d85f84d8537dca0d9642b774c270 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysRoleServiceImpl.java @@ -7,28 +7,26 @@ import com.github.pagehelper.PageInfo; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.components.security.SecurityConstants; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.common.security.SecurityConstants; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.inner.entity.SysRole; +import com.lframework.xingyun.template.inner.mappers.system.SysRoleMapper; import com.lframework.xingyun.template.inner.service.system.SysMenuService; import com.lframework.xingyun.template.inner.service.system.SysRoleService; -import com.lframework.xingyun.template.inner.mappers.system.SysRoleMapper; import com.lframework.xingyun.template.inner.vo.system.role.CreateSysRoleVo; import com.lframework.xingyun.template.inner.vo.system.role.QuerySysRoleVo; import com.lframework.xingyun.template.inner.vo.system.role.SysRoleSelectorVo; import com.lframework.xingyun.template.inner.vo.system.role.UpdateSysRoleVo; import java.io.Serializable; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -82,49 +80,38 @@ public class SysRoleServiceImpl extends BaseMpServiceImpl(datas)); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用角色，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用角色，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { - for (String id : ids) { - SysRole role = this.findById(id); - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { - throw new DefaultClientException( - "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】，不允许停用！"); - } + SysRole role = this.findById(id); + if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { + throw new DefaultClientException( + "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME + + "】，不允许停用！"); } - this.doBatchUnable(ids); + this.doUnable(id); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用角色，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用角色，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void enable(String id) { - for (String id : ids) { - SysRole role = this.findById(id); - if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { - throw new DefaultClientException( - "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME - + "】，不允许启用！"); - } + SysRole role = this.findById(id); + if (SecurityConstants.PERMISSION_ADMIN_NAME.equals(role.getPermission())) { + throw new DefaultClientException( + "角色【" + role.getName() + "】的权限为【" + SecurityConstants.PERMISSION_ADMIN_NAME + + "】，不允许启用！"); } - this.doBatchEnable(ids); + this.doEnable(id); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增角色，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增角色，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSysRoleVo vo) { @@ -152,7 +139,8 @@ public class SysRoleServiceImpl extends BaseMpServiceImpl ids) { + protected void doUnable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SysRole.class) - .set(SysRole::getAvailable, Boolean.FALSE).in(SysRole::getId, ids); + .set(SysRole::getAvailable, Boolean.FALSE).eq(SysRole::getId, id); getBaseMapper().update(updateWrapper); } - protected void doBatchEnable(Collection ids) { + protected void doEnable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SysRole.class) - .set(SysRole::getAvailable, Boolean.TRUE).in(SysRole::getId, ids); + .set(SysRole::getAvailable, Boolean.TRUE).eq(SysRole::getId, id); getBaseMapper().update(updateWrapper); } diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysSiteMessageServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysSiteMessageServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..3a834e8647311dd4a236bbf9896ed0e4fd8f5fa9 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysSiteMessageServiceImpl.java @@ -0,0 +1,121 @@ +package com.lframework.xingyun.template.inner.impl.system; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageInfo; +import com.lframework.starter.common.utils.Assert; +import com.lframework.starter.web.dto.WsPushData; +import com.lframework.starter.web.impl.BaseMpServiceImpl; +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.PageHelperUtil; +import com.lframework.starter.web.utils.PageResultUtil; +import com.lframework.starter.websocket.components.WsDataPusher; +import com.lframework.starter.websocket.events.UserConnectEvent; +import com.lframework.xingyun.template.inner.dto.message.site.SiteMessageDto; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.mappers.system.SysSiteMessageMapper; +import com.lframework.xingyun.template.inner.service.system.SysSiteMessageService; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageByUserVo; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageVo; +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class SysSiteMessageServiceImpl extends + BaseMpServiceImpl + implements SysSiteMessageService { + + @Autowired + private WsDataPusher wsDataPusher; + + @Override + public PageResult query(Integer pageIndex, Integer pageSize, + QuerySysSiteMessageVo vo) { + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = this.query(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public List query(QuerySysSiteMessageVo vo) { + return getBaseMapper().query(vo); + } + + @Override + public PageResult queryByUser(Integer pageIndex, Integer pageSize, + QuerySysSiteMessageByUserVo vo) { + + Assert.greaterThanZero(pageIndex); + Assert.greaterThanZero(pageSize); + + PageHelperUtil.startPage(pageIndex, pageSize); + List datas = getBaseMapper().queryByUser(vo); + + return PageResultUtil.convert(new PageInfo<>(datas)); + } + + @Override + public SiteMessageDto getContent(String id) { + SysSiteMessage data = getById(id); + if (data == null) { + return null; + } + return new SiteMessageDto(data); + } + + @Override + public SysSiteMessage findById(String id) { + return getById(id); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public boolean setReaded(String id) { + Wrapper updateWrapper = Wrappers.lambdaUpdate(SysSiteMessage.class) + .set(SysSiteMessage::getReaded, true) + .set(SysSiteMessage::getReadTime, LocalDateTime.now()) + .eq(SysSiteMessage::getId, id).eq(SysSiteMessage::getReaded, false); + return update(updateWrapper); + } + + @Override + public void noticeForWs(String userId) { + WsPushData pushData = new WsPushData(); + pushData.setBizType("siteMessage"); + pushData.setIncludeUserId(userId); + + wsDataPusher.push(pushData); + } + + @Override + public void noticeForWsWithSessionId(String sessionId) { + WsPushData pushData = new WsPushData(); + pushData.setBizType("siteMessage"); + pushData.setIncludeSessionIds(Collections.singletonList(sessionId)); + + wsDataPusher.push(pushData); + } + + @Component + public static class ReloadSiteMessageListener implements ApplicationListener { + + @Autowired + private SysSiteMessageService sysSiteMessageService; + + @Override + public void onApplicationEvent(UserConnectEvent event) { + sysSiteMessageService.noticeForWsWithSessionId(event.getSessionId()); + } + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java similarity index 94% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java index ba2589d84c99243c09ed18c135b38b1e8a00dad8..f249d06f966ad29e470dfa56d27bc60aa23cf9f4 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserDeptServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.core.enums.DefaultOpLogType; import com.lframework.xingyun.template.inner.vo.system.dept.SysUserDeptSettingVo; import com.lframework.xingyun.template.inner.mappers.system.SysUserDeptMapper; import com.lframework.xingyun.template.inner.entity.SysUserDept; @@ -23,7 +23,7 @@ public class SysUserDeptServiceImpl extends BaseMpServiceImpl implements SysUserDeptService { @OpLog(type = DefaultOpLogType.SYSTEM, name = "用户设置部门，用户ID：{}，部门ID：{}", params = {"#vo.userId", - "#vo.positionId"}) + "#vo.deptIds"}, loopFormat = true) @Transactional(rollbackFor = Exception.class) @Override public void setting(SysUserDeptSettingVo vo) { diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java similarity index 95% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java index 370b4c2f40e99f7240cf654b096a064432f48b6f..914335c0f4017821455b6efeab95ff701bd784de 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserRoleServiceImpl.java @@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; +import com.lframework.xingyun.core.annotations.OpLog; import com.lframework.xingyun.template.inner.entity.SysUserRole; import com.lframework.xingyun.template.inner.mappers.system.SysUserRoleMapper; import com.lframework.xingyun.template.inner.entity.SysRole; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.enums.DefaultOpLogType; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.xingyun.template.inner.service.system.SysRoleService; import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java similarity index 79% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java index 30a537d52e9aeca449e9d47f2c0b80b5725271c5..c5b9d7bea434bef212caa496a568f82d4158f89e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserServiceImpl.java @@ -8,35 +8,28 @@ import com.lframework.starter.common.constants.PatternPool; import com.lframework.starter.common.constants.StringPool; import com.lframework.starter.common.exceptions.impl.DefaultClientException; import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; import com.lframework.starter.common.utils.ObjectUtil; import com.lframework.starter.common.utils.RegUtil; import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.components.security.PasswordEncoderWrapper; import com.lframework.starter.web.impl.BaseMpServiceImpl; import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.utils.IdUtil; import com.lframework.starter.web.utils.PageHelperUtil; import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.components.code.GenerateCodeType; -import com.lframework.starter.web.components.generator.impl.AbstractFlowGenerator; -import com.lframework.starter.web.components.security.PasswordEncoderWrapper; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.annotations.OpLog; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.core.enums.DefaultOpLogType; +import com.lframework.xingyun.core.enums.Gender; +import com.lframework.xingyun.core.service.GenerateCodeService; +import com.lframework.xingyun.core.utils.OpLogUtil; import com.lframework.xingyun.template.inner.dto.UserInfoDto; -import com.lframework.starter.web.service.GenerateCodeService; -import com.lframework.starter.web.utils.EnumUtil; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.entity.SysUser; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.service.UserService; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.xingyun.template.inner.events.UpdateUserEvent; -import com.lframework.xingyun.template.inner.vo.system.dept.SysUserDeptSettingVo; -import com.lframework.xingyun.template.inner.vo.system.position.SysUserPositionSettingVo; import com.lframework.xingyun.template.inner.mappers.system.SysUserMapper; import com.lframework.xingyun.template.inner.service.system.SysUserDeptService; -import com.lframework.xingyun.template.inner.service.system.SysUserPositionService; import com.lframework.xingyun.template.inner.service.system.SysUserRoleService; import com.lframework.xingyun.template.inner.service.system.SysUserService; +import com.lframework.xingyun.template.inner.vo.system.dept.SysUserDeptSettingVo; import com.lframework.xingyun.template.inner.vo.system.user.CreateSysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.QuerySysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.RegistUserVo; @@ -50,21 +43,16 @@ import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service public class SysUserServiceImpl extends BaseMpServiceImpl implements - SysUserService, ApplicationListener { + SysUserService { @Autowired private PasswordEncoderWrapper encoderWrapper; - @Autowired - private SysUserPositionService sysUserPositionService; - @Autowired private SysUserDeptService sysUserDeptService; @@ -74,8 +62,7 @@ public class SysUserServiceImpl extends BaseMpServiceImpl query(Integer pageIndex, Integer pageSize, @@ -104,42 +91,36 @@ public class SysUserServiceImpl extends BaseMpServiceImpl ids) { + public SysUser findByCode(String code) { + Wrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getCode, code); + return getOne(queryWrapper); + } - if (CollectionUtil.isEmpty(ids)) { - return; - } + @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用用户，ID：{}", params = "#id") + @Transactional(rollbackFor = Exception.class) + @Override + public void enable(String id) { - this.doBatchEnable(ids); + this.doEnable(id); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用用户，ID：{}", params = "#ids", loopFormat = true) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用用户，ID：{}", params = "#id") @Transactional(rollbackFor = Exception.class) @Override - public void batchUnable(List ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } + public void unable(String id) { - this.doBatchUnable(ids); + this.doUnable(id); } - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增用户，ID：{}, 编号：{}", params = {"#id", "#code"}) + @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增用户，ID：{}, 编号：{}", params = {"#id", + "#code"}) @Transactional(rollbackFor = Exception.class) @Override public String create(CreateSysUserVo vo) { SysUser record = this.doCreate(vo); - SysUserPositionSettingVo positionSettingVo = new SysUserPositionSettingVo(); - positionSettingVo.setUserId(record.getId()); - positionSettingVo.setPositionIds(vo.getPositionIds()); - sysUserPositionService.setting(positionSettingVo); - SysUserDeptSettingVo deptSettingVo = new SysUserDeptSettingVo(); deptSettingVo.setUserId(record.getId()); deptSettingVo.setDeptIds(vo.getDeptIds()); @@ -157,7 +138,8 @@ public class SysUserServiceImpl extends BaseMpServiceImpl ids) { + protected void doEnable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SysUser.class) - .set(SysUser::getAvailable, Boolean.TRUE).in(SysUser::getId, ids); + .set(SysUser::getAvailable, Boolean.TRUE).eq(SysUser::getId, id); getBaseMapper().update(updateWrapper); } - protected void doBatchUnable(List ids) { + protected void doUnable(String id) { Wrapper updateWrapper = Wrappers.lambdaUpdate(SysUser.class) - .set(SysUser::getAvailable, Boolean.FALSE).in(SysUser::getId, ids); + .set(SysUser::getAvailable, Boolean.FALSE).eq(SysUser::getId, id); getBaseMapper().update(updateWrapper); } @@ -339,7 +316,7 @@ public class SysUserServiceImpl extends BaseMpServiceImpl message) { + + SysMailMessageDto dto = message.getPayload(); + log.info("接收到发送邮件消息 {}", dto); + + if (CollectionUtil.isNotEmpty(dto.getMailList())) { + dto.setMailList(dto.getMailList().stream().filter(t -> RegUtil.isMatch(PatternPool.EMAIL, t)).collect( + Collectors.toList())); + } + + if (CollectionUtil.isEmpty(dto.getMailList())) { + log.info("邮箱地址为空，不发送"); + return; + } + + String title = dto.getTitle(); + String content = dto.getContent(); + if (StringUtil.isBlank(title) || StringUtil.isBlank(content) || StringUtil.isBlank( + dto.getBizKey())) { + log.info("标题、内容、业务键不能为空，不发送"); + return; + } + + SysUser createBy = StringUtil.isBlank(dto.getCreateUserId()) ? null + : sysUserService.findById(dto.getCreateUserId()); + + List recordList = dto.getMailList().stream().distinct().map(t -> { + SysMailMessage record = new SysMailMessage(); + record.setId(IdUtil.getId()); + record.setTitle(title); + record.setContent(content); + record.setMail(t); + record.setBizKey(dto.getBizKey()); + record.setSendStatus(SysMailMessageSendStatus.UN_SEND); + if (createBy != null) { + record.setCreateById(createBy.getId()); + record.setCreateBy(createBy.getName()); + record.setUpdateBy(createBy.getName()); + record.setUpdateById(createBy.getId()); + } + + return record; + }).collect(Collectors.toList()); + + sysMailMessageService.saveBatch(recordList); + + try { + MailService mailService = ApplicationUtil.getBean(MailService.class); + mailService.send( + recordList.stream().map(SysMailMessage::getMail).collect(Collectors.toList()), + title, content); + + // 全部成功 + recordList.forEach(t -> t.setSendStatus(SysMailMessageSendStatus.SENDED)); + + } catch (MailException e) { + Throwable throwable = e.getCause(); + if (throwable instanceof SendFailedException) { + //部分失败 + Address[] invalidAddresses = ((SendFailedException) throwable).getInvalidAddresses(); + for (Address invalidAddress : invalidAddresses) { + String mail = invalidAddress.toString(); + recordList.stream().filter(t -> mail.equals(t.getMail())) + .findFirst().ifPresent(record -> record.setSendStatus(SysMailMessageSendStatus.FAIL)); + recordList.stream().filter(t -> t.getSendStatus() == SysMailMessageSendStatus.UN_SEND + ).forEach(record -> record.setSendStatus(SysMailMessageSendStatus.SENDED)); + } + } else { + // 全部失败 + recordList.forEach(t -> t.setSendStatus(SysMailMessageSendStatus.FAIL)); + log.error(e.getMessage(), e); + } + } + + sysMailMessageService.updateBatchById(recordList.stream().map(t -> { + SysMailMessage record = new SysMailMessage(); + record.setId(t.getId()); + record.setSendStatus(t.getSendStatus()); + record.setCreateById(t.getCreateById()); + record.setCreateBy(t.getCreateBy()); + record.setUpdateById(t.getUpdateById()); + record.setUpdateBy(t.getUpdateBy()); + + return record; + }).collect(Collectors.toList())); + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysNotifyListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysNotifyListener.java new file mode 100644 index 0000000000000000000000000000000000000000..db6414dcec721ff0ff9b23524531cec92a2bb9ae --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysNotifyListener.java @@ -0,0 +1,175 @@ +package com.lframework.xingyun.template.inner.listeners.mq; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.lframework.starter.common.constants.StringPool; +import com.lframework.starter.common.exceptions.impl.DefaultSysException; +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.mq.core.producer.MqProducer; +import com.lframework.starter.web.utils.ApplicationUtil; +import com.lframework.starter.web.utils.EnumUtil; +import com.lframework.starter.web.utils.IdUtil; +import com.lframework.xingyun.core.components.notify.SysNotifyRuleEmail; +import com.lframework.xingyun.core.components.notify.SysNotifyRuleSys; +import com.lframework.xingyun.core.dto.message.SysMailMessageDto; +import com.lframework.xingyun.core.dto.message.SysSiteMessageDto; +import com.lframework.xingyun.core.dto.notify.SysNotifyDto; +import com.lframework.xingyun.core.dto.notify.SysNotifyParamsDto; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.core.queue.MqConstants; +import com.lframework.xingyun.core.queue.MqStringPool; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.enums.system.SysNotifyMessageType; +import com.lframework.xingyun.template.inner.service.system.SysNotifyGroupService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.messaging.Message; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class SysNotifyListener { + + @Autowired + private SysNotifyGroupService sysNotifyGroupService; + + @Autowired + private SysUserService sysUserService; + + @Autowired + private MqProducer mqProducer; + + private static final int BATCH_SIZE = 100; + + @RabbitListener(bindings = { + @QueueBinding(value = @Queue(value = MqStringPool.SYS_NOTIFY_QUEUE), key = MqStringPool.SYS_NOTIFY_ROUTING_KEY, exchange = @Exchange(value = MqStringPool.SYS_NOTIFY_EXCHANGE))}) + public void execute(Message message) { + SysNotifyDto dto = message.getPayload(); + log.debug("接收到消息：{}", dto); + + SysNotifyGroup notifyGroup = sysNotifyGroupService.findById(dto.getNotifyGroupId()); + if (notifyGroup == null) { + log.info("消息通知组不存在，通知组ID：{}", dto.getNotifyGroupId()); + return; + } + if (!notifyGroup.getAvailable()) { + log.info("消息通知组不可用，通知组ID：{}", dto.getNotifyGroupId()); + return; + } + + Set userIds = sysNotifyGroupService.getReceiveUserIds(notifyGroup.getId()); + if (CollectionUtil.isEmpty(userIds)) { + log.info("消息通知组不存在接收人，通知组ID：{}", dto.getNotifyGroupId()); + return; + } + + List messageTypeCodes = Arrays.stream( + notifyGroup.getMessageType().split(StringPool.STR_SPLIT)).map(Integer::valueOf).collect( + Collectors.toList()); + for (Integer messageTypeCode : messageTypeCodes) { + SysNotifyMessageType messageType = EnumUtil.getByCode(SysNotifyMessageType.class, + messageTypeCode); + switch (messageType) { + case EMAIL: { + Map ruleMap = ApplicationUtil.getBeansOfType( + SysNotifyRuleEmail.class); + + for (SysNotifyRuleEmail rule : ruleMap.values()) { + if (!rule.match(dto.getBizType())) { + continue; + } + + log.info("匹配到rule，开始发送邮件"); + Wrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class) + .select(SysUser::getEmail) + .in(SysUser::getId, userIds) + .eq(SysUser::getAvailable, true) + .isNotNull(SysUser::getEmail) + .ne(SysUser::getEmail, StringPool.EMPTY_STR); + List userList = sysUserService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(userList)) { + SysNotifyParamsDto paramsDto = new SysNotifyParamsDto(); + paramsDto.setVariables(dto.getVariables()); + + String title = rule.getTitle(paramsDto); + String content = rule.getContent(paramsDto); + + List allMailList = userList.stream().map(SysUser::getEmail).distinct() + .collect( + Collectors.toList()); + List> splitMailList = CollectionUtil.split(allMailList, BATCH_SIZE); + for (List mailList : splitMailList) { + SysMailMessageDto messageDto = new SysMailMessageDto(); + messageDto.setMailList(mailList); + messageDto.setTitle(title); + messageDto.setContent(content); + messageDto.setBizKey(IdUtil.getId()); + messageDto.setCreateUserId(dto.getCreateUserId()); + + mqProducer.sendMessage(MqConstants.SYS_MAIL_MESSAGE, messageDto); + } + } + break; + } + break; + } + + case SYS: { + Map ruleMap = ApplicationUtil.getBeansOfType( + SysNotifyRuleSys.class); + + for (SysNotifyRuleSys rule : ruleMap.values()) { + if (!rule.match(dto.getBizType())) { + continue; + } + + log.info("匹配到rule，开始发送站内信"); + Wrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class) + .select(SysUser::getId) + .in(SysUser::getId, userIds) + .eq(SysUser::getAvailable, true); + List userList = sysUserService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(userList)) { + SysNotifyParamsDto paramsDto = new SysNotifyParamsDto(); + paramsDto.setVariables(dto.getVariables()); + + String title = rule.getTitle(paramsDto); + String content = rule.getContent(paramsDto); + + List allUserIdList = userList.stream().map(SysUser::getId).distinct() + .collect( + Collectors.toList()); + List> splitUserIdList = CollectionUtil.split(allUserIdList, BATCH_SIZE); + for (List userIdList : splitUserIdList) { + SysSiteMessageDto messageDto = new SysSiteMessageDto(); + messageDto.setUserIdList(userIdList); + messageDto.setTitle(title); + messageDto.setContent(content); + messageDto.setBizKey(IdUtil.getId()); + messageDto.setCreateUserId(dto.getCreateUserId()); + + mqProducer.sendMessage(MqConstants.SYS_SITE_MESSAGE, messageDto); + } + } + break; + } + break; + } + + default: { + throw new DefaultSysException("未知的MessageType: " + messageTypeCode); + } + } + } + } +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysSiteMessageListener.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysSiteMessageListener.java new file mode 100644 index 0000000000000000000000000000000000000000..ca4b2d5d13abe91d986034dac68cb956766c1a2d --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/listeners/mq/SysSiteMessageListener.java @@ -0,0 +1,92 @@ +package com.lframework.xingyun.template.inner.listeners.mq; + +import com.lframework.starter.common.utils.CollectionUtil; +import com.lframework.starter.common.utils.StringUtil; +import com.lframework.starter.web.dto.WsPushData; +import com.lframework.starter.web.utils.IdUtil; +import com.lframework.starter.websocket.components.WsDataPusher; +import com.lframework.xingyun.core.dto.message.SysSiteMessageDto; +import com.lframework.xingyun.template.inner.entity.SysUser; +import com.lframework.xingyun.core.queue.MqStringPool; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.service.system.SysSiteMessageService; +import com.lframework.xingyun.template.inner.service.system.SysUserService; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.messaging.Message; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class SysSiteMessageListener { + + @Autowired + private SysSiteMessageService sysSiteMessageService; + + @Autowired + private SysUserService sysUserService; + + @Autowired + private WsDataPusher wsDataPusher; + + @RabbitListener(bindings = { + @QueueBinding(value = @Queue(value = MqStringPool.SYS_SITE_MESSAGE_QUEUE), key = MqStringPool.SYS_SITE_MESSAGE_ROUTING_KEY, exchange = @Exchange(value = MqStringPool.SYS_SITE_MESSAGE_EXCHANGE))}) + public void execute(Message message) { + + SysSiteMessageDto dto = message.getPayload(); + log.info("接收到发送站内信消息 {}", dto); + + if (CollectionUtil.isEmpty(dto.getUserIdList())) { + log.info("接收人为空，不发送"); + return; + } + + String title = dto.getTitle(); + String content = dto.getContent(); + if (StringUtil.isBlank(title) || StringUtil.isBlank(content) || StringUtil.isBlank( + dto.getBizKey())) { + log.info("标题、内容、业务键不能为空，不发送"); + return; + } + + SysUser createBy = StringUtil.isBlank(dto.getCreateUserId()) ? null + : sysUserService.findById(dto.getCreateUserId()); + + List recordList = dto.getUserIdList().stream().distinct().map(t -> { + SysSiteMessage record = new SysSiteMessage(); + record.setId(IdUtil.getId()); + record.setTitle(title); + record.setContent(content); + record.setReceiverId(t); + record.setBizKey(dto.getBizKey()); + if (createBy != null) { + record.setCreateById(createBy.getId()); + record.setCreateBy(createBy.getName()); + record.setUpdateBy(createBy.getName()); + record.setUpdateById(createBy.getId()); + } + + return record; + }).collect(Collectors.toList()); + + sysSiteMessageService.saveBatch(recordList); + + for (SysSiteMessage sysSiteMessage : recordList) { + try { + WsPushData pushData = new WsPushData(); + pushData.setBizType("siteMessage"); + pushData.setIncludeUserId(sysSiteMessage.getReceiverId()); + wsDataPusher.push(pushData); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + } +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/QrtzMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/QrtzMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/QrtzMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/QrtzMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleTenantMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleTenantMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleTenantMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/SysModuleTenantMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java similarity index 85% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java index 62603979e2a9369592d39640271798d78d7a334b..11cd5b24f5bc343946b8d1c76df151713313e2f7 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/TenantMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.Tenant; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.tenant.QueryTenantVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java similarity index 83% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java index 61ed316de4f707b3e079c1dba8d7fb47cf743f42..e1b63a82fb17aeda0f37571fe1c35a2a9125fab5 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/UserDetailsMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.starter.web.common.security.DefaultUserDetails; +import com.lframework.starter.web.components.security.DefaultUserDetails; /** * 用于登录的用户信息查询Mapper diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicCategoryMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicCategoryMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicCategoryMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicCategoryMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java similarity index 84% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java index 8104ebd7ca3afb3e33d80451d7f1b0ded47a75b6..540e251362c97743412131daf1c7e32751c819e0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicItemMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.SysDataDicItem; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.dic.item.QuerySysDataDicItemVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java index e83e7aabea48d0ffe0d07ff6a959db4019a6fdae..a17c1c26a516b7882e839a0f3c765684c5ea760e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataDicMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.SysDataDic; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.dic.QuerySysDataDicVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java similarity index 73% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java index aae7a6eb81a64431c820b028e5fe9602556ecb0a..f95be5214908c859f637bc7fdaa5be9db2806670 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionDataMapper.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; import com.lframework.starter.web.mapper.BaseMapper; public interface SysDataPermissionDataMapper extends diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/SysDataPermissionModelDetailMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java similarity index 53% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/SysDataPermissionModelDetailMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java index 9398f061aaba4cd410b3d74624498db8aa1b0b01..d8c7b01daf2c86a238abd8619cef5f400d3ed41e 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/SysDataPermissionModelDetailMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDataPermissionModelDetailMapper.java @@ -1,7 +1,7 @@ -package com.lframework.xingyun.template.core.mappers; +package com.lframework.xingyun.template.inner.mappers.system; import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.core.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; public interface SysDataPermissionModelDetailMapper extends BaseMapper { diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDeptMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDeptMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDeptMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysDeptMapper.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysGenerateCodeMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysGenerateCodeMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..a918b54aa6631f4159ca33a13cbd9bc3b8624c16 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysGenerateCodeMapper.java @@ -0,0 +1,25 @@ +package com.lframework.xingyun.template.inner.mappers.system; + +import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.xingyun.template.inner.entity.SysGenerateCode; +import com.lframework.xingyun.template.inner.vo.system.generate.QuerySysGenerateCodeVo; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysGenerateCodeMapper extends + BaseMapper { + + /** + * 查询列表 + * + * @param vo + * @return + */ + @Sorts({ + @Sort(value = "id", alias = "tb", autoParse = true), + @Sort(value = "name", alias = "tb", autoParse = true), + }) + List query(@Param("vo") QuerySysGenerateCodeVo vo); +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserPositionMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java similarity index 34% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserPositionMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java index 0431f3a93b3886cd5d1b45493a690e5681b38dfe..2466b5262f9c7de9088eb5ac8b63a1c808efcbd0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserPositionMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMailMessageMapper.java @@ -1,24 +1,25 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.inner.entity.SysUserPosition; import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; +import com.lframework.xingyun.template.inner.vo.system.message.mail.QuerySysMailMessageVo; import java.util.List; +import org.apache.ibatis.annotations.Param; /** *

- * Mapper 接口 + * 邮件消息 Mapper 接口 *

* * @author zmj - * @since 2021-07-04 */ -public interface SysUserPositionMapper extends BaseMapper { +public interface SysMailMessageMapper extends BaseMapper { /** - * 根据用户ID查询 + * 查询列表 * - * @param userId + * @param vo * @return */ - List getByUserId(String userId); + List query(@Param("vo") QuerySysMailMessageVo vo); } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMenuMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMenuMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMenuMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysMenuMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeLogMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeLogMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeLogMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeLogMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNoticeMapper.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..ab24d30cea9c14e12e7764822787215c06802fb4 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupMapper.java @@ -0,0 +1,40 @@ +package com.lframework.xingyun.template.inner.mappers.system; + +import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.vo.system.notify.QuerySysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.SysNotifyGroupSelectorVo; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 消息通知组 Mapper 接口 + *

+ * + * @author zmj + */ +public interface SysNotifyGroupMapper extends BaseMapper { + + /** + * 查询列表 + * + * @param vo + * @return + */ + @Sorts({ + @Sort(value = "name", alias = "tb.name"), + @Sort(value = "createTime", alias = "tb.create_time"), + }) + List query(@Param("vo") QuerySysNotifyGroupVo vo); + + /** + * 选择器 + * + * @param vo + * @return + */ + List selector(@Param("vo") SysNotifyGroupSelectorVo vo); +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupReceiverMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupReceiverMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..14013bca9ad7d73f5f3309ffd501c48271ee5d95 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysNotifyGroupReceiverMapper.java @@ -0,0 +1,15 @@ +package com.lframework.xingyun.template.inner.mappers.system; + +import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroupReceiver; + +/** + *

+ * 消息通知组-接收者关系表 Mapper 接口 + *

+ * + * @author zmj + */ +public interface SysNotifyGroupReceiverMapper extends BaseMapper { + +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java similarity index 87% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java index 0db5ea8fd91b450be1a496aeedecf091eccc2b95..1dcf7dffff577873e10ddf2e229a41cbbd4c55ef 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysOpenDomainMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.SysOpenDomain; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.open.QuerySysOpenDomainVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java similarity index 84% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java index 46a2b946a7834ed4e44f14706c462ba427a036c2..a6649894970d075bb3a0f63b773ec0c8ced1287f 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysParameterMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.SysParameter; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.parameter.QuerySysParameterVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java index 844a6238f186f3e768033a186bfb932e8ed29d8e..6325cbe4030b5c23caeba9c78c5eaec3f608de0e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMapper.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.entity.SysRole; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.role.QuerySysRoleVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMenuMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMenuMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMenuMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysRoleMenuMapper.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysSiteMessageMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysSiteMessageMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..c337422b07fb3d33162bca63f9473ac4593f1b44 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysSiteMessageMapper.java @@ -0,0 +1,34 @@ +package com.lframework.xingyun.template.inner.mappers.system; + +import com.lframework.starter.web.mapper.BaseMapper; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageByUserVo; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageVo; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 站内信 Mapper 接口 + *

+ * + * @author zmj + */ +public interface SysSiteMessageMapper extends BaseMapper { + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(@Param("vo") QuerySysSiteMessageVo vo); + + /** + * 根据用户查询 + * + * @param vo + * @return + */ + List queryByUser(@Param("vo") QuerySysSiteMessageByUserVo vo); +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserDeptMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserDeptMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserDeptMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserDeptMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java similarity index 91% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java index 05c1ea1c1c1300fe1c99ec8d64281987f3c44b18..68eddc7799dcacdc56de382d9336d22e7f941349 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserMapper.java @@ -1,9 +1,9 @@ package com.lframework.xingyun.template.inner.mappers.system; -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; +import com.lframework.xingyun.core.annotations.sort.Sort; +import com.lframework.xingyun.core.annotations.sort.Sorts; import com.lframework.xingyun.template.inner.dto.UserInfoDto; -import com.lframework.xingyun.template.core.entity.SysUser; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.starter.web.mapper.BaseMapper; import com.lframework.xingyun.template.inner.vo.system.user.QuerySysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.SysUserSelectorVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserRoleMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserRoleMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserRoleMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserRoleMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserTelephoneMapper.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserTelephoneMapper.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserTelephoneMapper.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysUserTelephoneMapper.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/QrtzService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/QrtzService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/QrtzService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/QrtzService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleTenantService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleTenantService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleTenantService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/SysModuleTenantService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/TenantService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/TenantService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/TenantService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/TenantService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicCategoryService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicCategoryService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicCategoryService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicCategoryService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicItemService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicItemService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicItemService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicItemService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataDicService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java similarity index 88% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java index a3ce7536190b4f9c7af69b26a6c36d6f503f0231..62631ad0609257b9dc8bb64df9b67ea62b3b8f51 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionDataService.java @@ -1,6 +1,6 @@ package com.lframework.xingyun.template.inner.service.system; -import com.lframework.xingyun.template.core.entity.SysDataPermissionData; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionData; import com.lframework.starter.web.service.BaseMpService; import java.util.List; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/SysDataPermissionModelDetailService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java similarity index 71% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/SysDataPermissionModelDetailService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java index 6868f7ff9128fb5c21b7b2c34673530334a3a68f..02d83613deeddb2aaa5a534218445e4f64a5f034 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/SysDataPermissionModelDetailService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDataPermissionModelDetailService.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.template.core.service; +package com.lframework.xingyun.template.inner.service.system; import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.core.vo.permission.SysDataPermissionModelDetailVo; -import com.lframework.xingyun.template.core.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.entity.SysDataPermissionModelDetail; +import com.lframework.xingyun.template.inner.vo.system.permission.SysDataPermissionModelDetailVo; import java.util.List; import java.util.Map; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java similarity index 82% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java index 24ed8c2d99ad7305a75e8412ad250a4c9e48962c..8c0edcd2c789ad369bca2eeca1a139444d9c9547 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysDeptService.java @@ -1,7 +1,7 @@ package com.lframework.xingyun.template.inner.service.system; -import com.lframework.xingyun.template.inner.entity.SysDept; import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysDept; import com.lframework.xingyun.template.inner.vo.system.dept.CreateSysDeptVo; import com.lframework.xingyun.template.inner.vo.system.dept.UpdateSysDeptVo; import java.util.Collection; @@ -24,19 +24,27 @@ public interface SysDeptService extends BaseMpService { */ SysDept findById(String id); + /** + * 根据编号查询 + * + * @param code + * @return + */ + SysDept findByCode(String code); + /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysGenerateCodeService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysGenerateCodeService.java new file mode 100644 index 0000000000000000000000000000000000000000..1037348db333492aaa2482c7d6b36f2b35f2b098 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysGenerateCodeService.java @@ -0,0 +1,71 @@ +package com.lframework.xingyun.template.inner.service.system; + +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysGenerateCode; +import com.lframework.xingyun.template.inner.vo.system.generate.CreateSysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.QuerySysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.SettingSysGenerateCodeVo; +import com.lframework.xingyun.template.inner.vo.system.generate.UpdateSysGenerateCodeVo; +import java.util.List; + +/** + * 编号规则 Service + * + * @author zmj + */ +public interface SysGenerateCodeService extends BaseMpService { + + /** + * 查询列表 + * + * @return + */ + PageResult query(Integer pageIndex, Integer pageSize, QuerySysGenerateCodeVo vo); + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(QuerySysGenerateCodeVo vo); + + /** + * 根据ID查询 + * + * @param id + * @return + */ + SysGenerateCode findById(Integer id); + + /** + * 创建 + * + * @param vo + * @return + */ + Integer create(CreateSysGenerateCodeVo vo); + + /** + * 修改 + * + * @param vo + */ + void update(UpdateSysGenerateCodeVo vo); + + /** + * 根据ID删除 + * + * @param id + * @return + */ + void deleteById(Integer id); + + /** + * 设置 + * + * @param vo + */ + void setting(SettingSysGenerateCodeVo vo); +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMailMessageService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMailMessageService.java new file mode 100644 index 0000000000000000000000000000000000000000..116ca471448db687a68a7edb3f9db887f94af30a --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMailMessageService.java @@ -0,0 +1,36 @@ +package com.lframework.xingyun.template.inner.service.system; + +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysMailMessage; +import com.lframework.xingyun.template.inner.vo.system.message.mail.QuerySysMailMessageVo; +import java.util.List; + +public interface SysMailMessageService extends BaseMpService { + + /** + * 查询列表 + * + * @param pageIndex + * @param pageSize + * @param vo + * @return + */ + PageResult query(Integer pageIndex, Integer pageSize, QuerySysMailMessageVo vo); + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(QuerySysMailMessageVo vo); + + /** + * 根据ID查询 + * + * @param id + * @return + */ + SysMailMessage findById(String id); +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java similarity index 92% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java index 92b44f54973ba7673ee82a90a21eef9a9851cc2b..5cc65946b081637711c3216f0f7d28f1e44bc3e1 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysMenuService.java @@ -73,18 +73,16 @@ public interface SysMenuService extends BaseMpService { /** * 批量启用 * - * @param ids - * @param userId + * @param id */ - void batchEnable(List ids, String userId); + void enable(String id); /** - * 批量停用 + * 停用 * - * @param ids - * @param userId + * @param id */ - void batchUnable(List ids, String userId); + void unable(String id); /** * 是否存在权限 diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeLogService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeLogService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeLogService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeLogService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNoticeService.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupReceiverService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupReceiverService.java new file mode 100644 index 0000000000000000000000000000000000000000..d9bfaaf192c2d8199e31931e177c43a4f975d3a4 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupReceiverService.java @@ -0,0 +1,16 @@ +package com.lframework.xingyun.template.inner.service.system; + +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroupReceiver; +import java.util.List; + +public interface SysNotifyGroupReceiverService extends BaseMpService { + + /** + * 根据组ID查询接收方ID + * + * @param groupId + * @return + */ + List getReceiverIdsByGroupId(String groupId); +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupService.java new file mode 100644 index 0000000000000000000000000000000000000000..ce8f01cd456c9e5a78ff8c9ff4bd00c71265c2ba --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysNotifyGroupService.java @@ -0,0 +1,72 @@ +package com.lframework.xingyun.template.inner.service.system; + +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysNotifyGroup; +import com.lframework.xingyun.template.inner.vo.system.notify.CreateSysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.QuerySysNotifyGroupVo; +import com.lframework.xingyun.template.inner.vo.system.notify.SysNotifyGroupSelectorVo; +import com.lframework.xingyun.template.inner.vo.system.notify.UpdateSysNotifyGroupVo; +import java.util.List; +import java.util.Set; + +public interface SysNotifyGroupService extends BaseMpService { + + /** + * 查询列表 + * + * @param pageIndex + * @param pageSize + * @param vo + * @return + */ + PageResult query(Integer pageIndex, Integer pageSize, + QuerySysNotifyGroupVo vo); + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(QuerySysNotifyGroupVo vo); + + /** + * 根据ID查询 + * + * @param id + * @return + */ + SysNotifyGroup findById(String id); + + /** + * 选择器 + * + * @return + */ + PageResult selector(Integer pageIndex, Integer pageSize, + SysNotifyGroupSelectorVo vo); + + /** + * 创建 + * + * @param vo + * @return + */ + String create(CreateSysNotifyGroupVo vo); + + /** + * 修改 + * + * @param vo + */ + void update(UpdateSysNotifyGroupVo vo); + + /** + * 根据ID查询接收人ID + * + * @param id + * @return + */ + Set getReceiveUserIds(String id); +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysOpenDomainService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysOpenDomainService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysOpenDomainService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysOpenDomainService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysParameterService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysParameterService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysParameterService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysParameterService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleMenuService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleMenuService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleMenuService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleMenuService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java index 03c5467906be17ee3f577a23f97317243a0293e4..44fda83667b415fe1653bacb24077637d148bd6a 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysRoleService.java @@ -7,7 +7,6 @@ import com.lframework.xingyun.template.inner.vo.system.role.CreateSysRoleVo; import com.lframework.xingyun.template.inner.vo.system.role.QuerySysRoleVo; import com.lframework.xingyun.template.inner.vo.system.role.SysRoleSelectorVo; import com.lframework.xingyun.template.inner.vo.system.role.UpdateSysRoleVo; -import java.util.Collection; import java.util.List; public interface SysRoleService extends BaseMpService { @@ -45,16 +44,16 @@ public interface SysRoleService extends BaseMpService { /** * 根据ID停用 * - * @param ids + * @param id */ - void batchUnable(Collection ids); + void unable(String id); /** * 根据ID启用 * - * @param ids + * @param id */ - void batchEnable(Collection ids); + void enable(String id); /** * 创建 diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysSiteMessageService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysSiteMessageService.java new file mode 100644 index 0000000000000000000000000000000000000000..348941a9ebf6e0643e77cf2f91b883c30405850f --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysSiteMessageService.java @@ -0,0 +1,76 @@ +package com.lframework.xingyun.template.inner.service.system; + +import com.lframework.starter.web.resp.PageResult; +import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.dto.message.site.SiteMessageDto; +import com.lframework.xingyun.template.inner.entity.SysSiteMessage; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageByUserVo; +import com.lframework.xingyun.template.inner.vo.system.message.site.QuerySysSiteMessageVo; +import java.util.List; + +public interface SysSiteMessageService extends BaseMpService { + + /** + * 查询列表 + * + * @param pageIndex + * @param pageSize + * @param vo + * @return + */ + PageResult query(Integer pageIndex, Integer pageSize, QuerySysSiteMessageVo vo); + + /** + * 查询列表 + * + * @param vo + * @return + */ + List query(QuerySysSiteMessageVo vo); + + /** + * 根据用户查询 + * + * @param pageIndex + * @param pageSize + * @param vo + * @return + */ + PageResult queryByUser(Integer pageIndex, Integer pageSize, + QuerySysSiteMessageByUserVo vo); + + /** + * 查询内容 + * + * @param id + * @return + */ + SiteMessageDto getContent(String id); + + /** + * 根据ID查询 + * + * @param id + * @return + */ + SysSiteMessage findById(String id); + + /** + * 设置已读 + * + * @param id + */ + boolean setReaded(String id); + + /** + * WS通知 + * + * @param userId + */ + void noticeForWs(String userId); + + /** + * 发送通知 + */ + void noticeForWsWithSessionId(String sessionId); +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserDeptService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserDeptService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserDeptService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserDeptService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserRoleService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserRoleService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserRoleService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserRoleService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java similarity index 89% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java index b414057b254624efb84294275330bf012b2999e4..05eb9ff8f93286919afa88bc187a1d9ebd42246d 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserService.java @@ -2,8 +2,8 @@ package com.lframework.xingyun.template.inner.service.system; import com.lframework.starter.web.resp.PageResult; import com.lframework.starter.web.service.BaseMpService; +import com.lframework.xingyun.template.inner.entity.SysUser; import com.lframework.xingyun.template.inner.dto.UserInfoDto; -import com.lframework.xingyun.template.core.entity.SysUser; import com.lframework.xingyun.template.inner.vo.system.user.CreateSysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.QuerySysUserVo; import com.lframework.xingyun.template.inner.vo.system.user.RegistUserVo; @@ -40,18 +40,26 @@ public interface SysUserService extends BaseMpService { SysUser findById(String id); /** - * 批量启用 + * 根据编号查询 * - * @param ids + * @param code + * @return */ - void batchEnable(List ids); + SysUser findByCode(String code); /** - * 批量停用 + * 启用 * - * @param ids + * @param id + */ + void enable(String id); + + /** + * 停用 + * + * @param id */ - void batchUnable(List ids); + void unable(String id); /** * 创建 diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserTelephoneService.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserTelephoneService.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserTelephoneService.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserTelephoneService.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java similarity index 96% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java index c2c7417cddbd43a7d41f5e6518bf0f6961b55b0c..42f9311e1b2b2be399dcd82b735ef74253e2adbf 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/handler/DefaultCheckSignHandler.java @@ -5,7 +5,7 @@ import com.lframework.starter.common.utils.StringUtil; import com.lframework.xingyun.template.inner.sign.util.SignUtil; import com.lframework.xingyun.template.inner.entity.SysOpenDomain; import com.lframework.xingyun.template.inner.service.system.SysOpenDomainService; -import com.lframework.starter.web.common.tenant.TenantContextHolder; +import com.lframework.starter.web.components.tenant.TenantContextHolder; import com.lframework.starter.web.sign.CheckSignHandler; import com.lframework.starter.web.utils.TenantUtil; import com.lframework.starter.web.vo.OpenApiReqVo; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/sign/util/SignUtil.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/util/SignUtil.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/sign/util/SignUtil.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/sign/util/SignUtil.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/CreateQrtzVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/CreateQrtzVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/CreateQrtzVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/CreateQrtzVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/QueryQrtzVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/QueryQrtzVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/QueryQrtzVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/QueryQrtzVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/UpdateQrtzVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/UpdateQrtzVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/UpdateQrtzVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/qrtz/UpdateQrtzVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/config/UpdateSysConfigVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/config/UpdateSysConfigVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/config/UpdateSysConfigVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/config/UpdateSysConfigVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/CreateSysDeptVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/CreateSysDeptVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/CreateSysDeptVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/CreateSysDeptVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/SysUserDeptSettingVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/SysUserDeptSettingVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/SysUserDeptSettingVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/SysUserDeptSettingVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/UpdateSysDeptVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/UpdateSysDeptVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/UpdateSysDeptVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dept/UpdateSysDeptVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/CreateSysDataDicVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/CreateSysDataDicVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/CreateSysDataDicVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/CreateSysDataDicVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/QuerySysDataDicVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/QuerySysDataDicVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/QuerySysDataDicVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/QuerySysDataDicVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/SysDataDicSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/SysDataDicSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/SysDataDicSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/SysDataDicSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/UpdateSysDataDicVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/UpdateSysDataDicVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/UpdateSysDataDicVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/UpdateSysDataDicVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/CreateSysDataDicCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/CreateSysDataDicCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/CreateSysDataDicCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/CreateSysDataDicCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/SysDataDicCategorySelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/SysDataDicCategorySelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/SysDataDicCategorySelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/SysDataDicCategorySelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/UpdateSysDataDicCategoryVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/UpdateSysDataDicCategoryVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/UpdateSysDataDicCategoryVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/category/UpdateSysDataDicCategoryVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/CreateSysDataDicItemVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/CreateSysDataDicItemVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/CreateSysDataDicItemVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/CreateSysDataDicItemVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/QuerySysDataDicItemVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/QuerySysDataDicItemVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/QuerySysDataDicItemVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/QuerySysDataDicItemVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/UpdateSysDataDicItemVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/UpdateSysDataDicItemVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/UpdateSysDataDicItemVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/dic/item/UpdateSysDataDicItemVo.java diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApproveRefuseCustomerSettleCheckSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java similarity index 40% rename from xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApproveRefuseCustomerSettleCheckSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java index de8a645cf2af853c56ad5de043377abeabb26038..034410613d844a6cbcb15571fdcc73ff4ec2d11b 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/customer/BatchApproveRefuseCustomerSettleCheckSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/CreateSysGenerateCodeVo.java @@ -1,29 +1,29 @@ -package com.lframework.xingyun.settle.vo.check.customer; +package com.lframework.xingyun.template.inner.vo.system.generate; +import com.lframework.starter.web.components.validation.IsJsonArray; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class BatchApproveRefuseCustomerSettleCheckSheetVo implements BaseVo, Serializable { +public class CreateSysGenerateCodeVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; /** - * ID + * 规则ID */ - @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "对账单ID不能为空！") - private List ids; + @ApiModelProperty(value = "规则ID", required = true) + @NotNull(message = "请输入规则ID！") + private Integer id; /** - * 拒绝理由 + * 名称 */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; + @ApiModelProperty(value = "名称", required = true) + @NotBlank(message = "请输入名称！") + private String name; } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApproveRefuseSettlePreSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java similarity index 41% rename from xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApproveRefuseSettlePreSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java index ddf4c4713c7ebd845bea42263ab83ed76ffd2cf9..5a52ca39fa4ecb0d8b4d435df0ded9de2b2477b7 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/pre/BatchApproveRefuseSettlePreSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/PreviewSysGenerateCodeVo.java @@ -1,29 +1,23 @@ -package com.lframework.xingyun.settle.vo.pre; +package com.lframework.xingyun.template.inner.vo.system.generate; +import com.lframework.starter.web.components.validation.IsJsonArray; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class BatchApproveRefuseSettlePreSheetVo implements BaseVo, Serializable { +public class PreviewSysGenerateCodeVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; /** - * ID + * 配置规则 */ - @ApiModelProperty("ID") - @NotNull(message = "费用单ID不能为空！") - private List ids; - - /** - * 拒绝理由 - */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; + @ApiModelProperty(value = "配置规则", required = true) + @NotBlank(message = "配置规则不能为空！") + @IsJsonArray(message = "配置规则格式错误！") + private String configStr; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/QuerySysPositionVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java similarity index 51% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/QuerySysPositionVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java index 733a0e25d2990f10f3ab089e0468fcd99744214f..4f7e489193d77784a587b867df674c892dd85a77 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/QuerySysPositionVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/QuerySysGenerateCodeVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.inner.vo.system.position; +package com.lframework.xingyun.template.inner.vo.system.generate; import com.lframework.starter.web.vo.BaseVo; import com.lframework.starter.web.vo.SortPageVo; @@ -7,25 +7,16 @@ import java.io.Serializable; import lombok.Data; @Data -public class QuerySysPositionVo extends SortPageVo implements BaseVo, Serializable { +public class QuerySysGenerateCodeVo extends SortPageVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; + @ApiModelProperty("规则ID") + private Integer id; /** * 名称 */ @ApiModelProperty("名称") private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApproveRefuseSettleCheckSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java similarity index 43% rename from xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApproveRefuseSettleCheckSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java index c1309200105a057fa4254566739351843d173693..659bdee0974fb11d81f833718db647f3bf32e2d3 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/check/BatchApproveRefuseSettleCheckSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/SettingSysGenerateCodeVo.java @@ -1,15 +1,15 @@ -package com.lframework.xingyun.settle.vo.check; +package com.lframework.xingyun.template.inner.vo.system.generate; +import com.lframework.starter.web.components.validation.IsJsonArray; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class BatchApproveRefuseSettleCheckSheetVo implements BaseVo, Serializable { +public class SettingSysGenerateCodeVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -17,13 +17,14 @@ public class BatchApproveRefuseSettleCheckSheetVo implements BaseVo, Serializabl * ID */ @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "对账单ID不能为空！") - private List ids; + @NotNull(message = "id不能为空！") + private Integer id; /** - * 拒绝理由 + * 配置规则 */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; + @ApiModelProperty(value = "配置规则", required = true) + @NotBlank(message = "配置规则不能为空！") + @IsJsonArray(message = "配置规则格式错误！") + private String configStr; } diff --git a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApproveRefuseSettleFeeSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java similarity index 48% rename from xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApproveRefuseSettleFeeSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java index 62ea2ae576d7d755c40d00b71f5672b9d5adcbb8..ef21250a7c345e0515f5eb07306b0a8efe627e74 100644 --- a/xingyun-settle/src/main/java/com/lframework/xingyun/settle/vo/fee/BatchApproveRefuseSettleFeeSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/generate/UpdateSysGenerateCodeVo.java @@ -1,15 +1,15 @@ -package com.lframework.xingyun.settle.vo.fee; +package com.lframework.xingyun.template.inner.vo.system.generate; +import com.lframework.starter.web.components.validation.IsJsonArray; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class BatchApproveRefuseSettleFeeSheetVo implements BaseVo, Serializable { +public class UpdateSysGenerateCodeVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; @@ -17,13 +17,13 @@ public class BatchApproveRefuseSettleFeeSheetVo implements BaseVo, Serializable * ID */ @ApiModelProperty(value = "ID", required = true) - @NotNull(message = "费用单ID不能为空！") - private List ids; + @NotNull(message = "id不能为空！") + private Integer id; /** - * 拒绝理由 + * 名称 */ - @ApiModelProperty(value = "拒绝理由", required = true) - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; + @ApiModelProperty(value = "名称", required = true) + @NotBlank(message = "请输入名称！") + private String name; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/CreateSysMenuVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/CreateSysMenuVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/CreateSysMenuVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/CreateSysMenuVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/SysMenuSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/SysMenuSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/SysMenuSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/SysMenuSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/UpdateSysMenuVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/UpdateSysMenuVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/UpdateSysMenuVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/menu/UpdateSysMenuVo.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/mail/QuerySysMailMessageVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/mail/QuerySysMailMessageVo.java new file mode 100644 index 0000000000000000000000000000000000000000..73856a49fd180f7ed5dbb7031e9138db441baa49 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/mail/QuerySysMailMessageVo.java @@ -0,0 +1,47 @@ +package com.lframework.xingyun.template.inner.vo.system.message.mail; + +import com.lframework.starter.web.components.validation.TypeMismatch; +import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.vo.PageVo; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +@Data +public class QuerySysMailMessageVo extends PageVo implements BaseVo, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 创建时间 起始时间 + */ + @ApiModelProperty("创建时间 起始时间") + @TypeMismatch(message = "创建时间起始时间格式有误！") + private LocalDateTime createTimeStart; + + /** + * 创建时间 截止时间 + */ + @ApiModelProperty("创建时间 截止时间") + @TypeMismatch(message = "创建时间截止时间格式有误！") + private LocalDateTime createTimeEnd; + + /** + * 邮箱地址 + */ + @ApiModelProperty("邮箱地址") + private String mail; + + /** + * 发送状态 + */ + @ApiModelProperty("发送状态") + private Integer sendStatus; +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageByUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageByUserVo.java new file mode 100644 index 0000000000000000000000000000000000000000..85ecd5b05f1a22d33bdb2c595630af5b7eff9a88 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageByUserVo.java @@ -0,0 +1,48 @@ +package com.lframework.xingyun.template.inner.vo.system.message.site; + +import com.lframework.starter.web.components.validation.TypeMismatch; +import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.vo.PageVo; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +@Data +public class QuerySysSiteMessageByUserVo extends PageVo implements BaseVo, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 创建时间 起始时间 + */ + @ApiModelProperty("创建时间 起始时间") + @TypeMismatch(message = "创建时间起始时间格式有误！") + private LocalDateTime createTimeStart; + + /** + * 创建时间 截止时间 + */ + @ApiModelProperty("创建时间 截止时间") + @TypeMismatch(message = "创建时间截止时间格式有误！") + private LocalDateTime createTimeEnd; + + /** + * 用户ID + */ + @ApiModelProperty(hidden = true) + private String userId; + + /** + * 是否已读 + */ + @ApiModelProperty("是否已读") + private Boolean readed; + +} diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageVo.java new file mode 100644 index 0000000000000000000000000000000000000000..3a5d5de5d78756cde12af9fd0efc029aa1d15bb8 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/message/site/QuerySysSiteMessageVo.java @@ -0,0 +1,42 @@ +package com.lframework.xingyun.template.inner.vo.system.message.site; + +import com.lframework.starter.web.components.validation.TypeMismatch; +import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.vo.PageVo; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +@Data +public class QuerySysSiteMessageVo extends PageVo implements BaseVo, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 创建时间 起始时间 + */ + @ApiModelProperty("创建时间 起始时间") + @TypeMismatch(message = "创建时间起始时间格式有误！") + private LocalDateTime createTimeStart; + + /** + * 创建时间 截止时间 + */ + @ApiModelProperty("创建时间 截止时间") + @TypeMismatch(message = "创建时间截止时间格式有误！") + private LocalDateTime createTimeEnd; + + /** + * 是否已读 + */ + @ApiModelProperty("是否已读") + private Boolean readed; + +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/module/SysModuleTenantVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/module/SysModuleTenantVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/module/SysModuleTenantVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/module/SysModuleTenantVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/CreateSysNoticeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/CreateSysNoticeVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/CreateSysNoticeVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/CreateSysNoticeVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeByUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeByUserVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeByUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeByUserVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/QuerySysNoticeVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/UpdateSysNoticeVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/UpdateSysNoticeVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/UpdateSysNoticeVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notice/UpdateSysNoticeVo.java diff --git a/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/CreateSysNotifyGroupVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/CreateSysNotifyGroupVo.java new file mode 100644 index 0000000000000000000000000000000000000000..aeacdd0ac44d1447937752fd19666f92418c4939 --- /dev/null +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/CreateSysNotifyGroupVo.java @@ -0,0 +1,53 @@ +package com.lframework.xingyun.template.inner.vo.system.notify; + +import com.lframework.starter.web.components.validation.IsEnum; +import com.lframework.starter.web.vo.BaseVo; +import com.lframework.xingyun.template.inner.enums.system.SysNotifyReceiverType; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import lombok.Data; + +@Data +public class CreateSysNotifyGroupVo implements BaseVo, Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @ApiModelProperty(value = "名称", required = true) + @NotBlank(message = "名称不能为空！") + private String name; + + /** + * 接收者类型 + */ + @ApiModelProperty(value = "接收者类型", required = true) + @NotNull(message = "接收者类型不能为空！") + @IsEnum(enumClass = SysNotifyReceiverType.class, message = "接收者类型格式不正确！") + private Integer receiverType; + + /** + * 接收者ID + */ + @ApiModelProperty(value = "接收者ID", required = true) + @NotEmpty(message = "接收者ID不能为空！") + private List receiverIds; + + /** + * 消息类型 + */ + @ApiModelProperty(value = "消息类型", required = true) + @NotEmpty(message = "消息类型不能为空！") + private List messageType; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String description; +} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/UpdateSysPositionVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java similarity index 31% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/UpdateSysPositionVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java index b3846196b52d9edb5254682e9ef55ce5b57f3f14..e91fd772469954c02a309bbc0e84c171ca1301a5 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/UpdateSysPositionVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/QuerySysNotifyGroupVo.java @@ -1,50 +1,43 @@ -package com.lframework.xingyun.template.inner.vo.system.position; +package com.lframework.xingyun.template.inner.vo.system.notify; -import com.lframework.starter.web.components.validation.IsCode; +import com.lframework.starter.web.components.validation.TypeMismatch; import com.lframework.starter.web.vo.BaseVo; +import com.lframework.starter.web.vo.SortPageVo; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; import lombok.Data; @Data -public class UpdateSysPositionVo implements BaseVo, Serializable { +public class QuerySysNotifyGroupVo extends SortPageVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; /** - * ID + * 名称 */ - @ApiModelProperty("ID") - @NotBlank(message = "ID不能为空！") - private String id; + @ApiModelProperty("名称") + private String name; /** - * 岗位编号 + * 创建时间 起始时间 */ - @ApiModelProperty("岗位编号") - @IsCode - @NotBlank(message = "请输入编号！") - private String code; + @ApiModelProperty("创建时间 起始时间") + @TypeMismatch(message = "创建时间起始时间格式有误！") + private LocalDateTime createTimeStart; /** - * 岗位名称 + * 创建时间 截止时间 */ - @ApiModelProperty("岗位名称") - @NotBlank(message = "请输入名称！") - private String name; + @ApiModelProperty("创建时间 截止时间") + @TypeMismatch(message = "创建时间截止时间格式有误！") + private LocalDateTime createTimeEnd; /** * 状态 */ @ApiModelProperty("状态") - @NotNull(message = "状态不能为空！") + @TypeMismatch(message = "状态格式有误！") private Boolean available; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysPositionSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java similarity index 64% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysPositionSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java index c783745f865f82709643fd3dcd19195bb69fdb98..c6ea92f930428281fd6531004c2bffc2b9f4e957 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysPositionSelectorVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/SysNotifyGroupSelectorVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.inner.vo.system.position; +package com.lframework.xingyun.template.inner.vo.system.notify; import com.lframework.starter.web.vo.BaseVo; import com.lframework.starter.web.vo.PageVo; @@ -7,16 +7,10 @@ import java.io.Serializable; import lombok.Data; @Data -public class SysPositionSelectorVo extends PageVo implements BaseVo, Serializable { +public class SysNotifyGroupSelectorVo extends PageVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; - /** - * 编号 - */ - @ApiModelProperty("编号") - private String code; - /** * 名称 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/UpdateStockCostAdjustSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java similarity index 48% rename from xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/UpdateStockCostAdjustSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java index c7d5ee9b5c8c263140444f4f794714ad00361a31..bcc2a9738a4d52c5aa8b8145d92a8a20269010c1 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/UpdateStockCostAdjustSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/notify/UpdateSysNotifyGroupVo.java @@ -1,11 +1,12 @@ -package com.lframework.xingyun.sc.vo.stock.adjust.cost; +package com.lframework.xingyun.template.inner.vo.system.notify; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class UpdateStockCostAdjustSheetVo extends CreateStockCostAdjustSheetVo { +public class UpdateSysNotifyGroupVo extends CreateSysNotifyGroupVo { private static final long serialVersionUID = 1L; @@ -15,4 +16,11 @@ public class UpdateStockCostAdjustSheetVo extends CreateStockCostAdjustSheetVo { @ApiModelProperty(value = "ID", required = true) @NotBlank(message = "id不能为空！") private String id; + + /** + * 状态 + */ + @ApiModelProperty(value = "状态", required = true) + @NotNull(message = "状态不能为空！") + private Boolean available; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/CreateSysOpenDomainVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/CreateSysOpenDomainVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/CreateSysOpenDomainVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/CreateSysOpenDomainVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/QuerySysOpenDomainVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/QuerySysOpenDomainVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/QuerySysOpenDomainVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/QuerySysOpenDomainVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/SysOpenDomainSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/SysOpenDomainSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/SysOpenDomainSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/SysOpenDomainSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainSecretVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/open/UpdateSysOpenDomainVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/CreateSysParameterVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/CreateSysParameterVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/CreateSysParameterVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/CreateSysParameterVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/QuerySysParameterVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/QuerySysParameterVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/QuerySysParameterVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/QuerySysParameterVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/UpdateSysParameterVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/UpdateSysParameterVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/UpdateSysParameterVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/parameter/UpdateSysParameterVo.java diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/CreateSysDataPermissionDataVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java similarity index 88% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/CreateSysDataPermissionDataVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java index 5d090ec20ab95934e64e39607a5c11273e01f538..f28f5990b1901ec93e215b1701228d448d1bc80d 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/CreateSysDataPermissionDataVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/CreateSysDataPermissionDataVo.java @@ -1,8 +1,8 @@ -package com.lframework.xingyun.template.core.vo.permission; +package com.lframework.xingyun.template.inner.vo.system.permission; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.vo.BaseVo; -import com.lframework.xingyun.template.core.enums.SysDataPermissionDataBizType; +import com.lframework.xingyun.template.inner.enums.system.SysDataPermissionDataBizType; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/SysDataPermissionModelDetailVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java similarity index 94% rename from xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/SysDataPermissionModelDetailVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java index b69246d9db7f617284fb434f780efcfd9f08a782..97eee1e300cdac765bc1b919b7cccd0d4c23952b 100644 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/vo/permission/SysDataPermissionModelDetailVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/permission/SysDataPermissionModelDetailVo.java @@ -1,4 +1,4 @@ -package com.lframework.xingyun.template.core.vo.permission; +package com.lframework.xingyun.template.inner.vo.system.permission; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/CreateSysRoleVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/CreateSysRoleVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/CreateSysRoleVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/CreateSysRoleVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/QuerySysRoleVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/QuerySysRoleVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/QuerySysRoleVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/QuerySysRoleVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleMenuSettingVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleMenuSettingVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleMenuSettingVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleMenuSettingVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/SysRoleSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/UpdateSysRoleVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/UpdateSysRoleVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/UpdateSysRoleVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/role/UpdateSysRoleVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/CreateTenantVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/CreateTenantVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/CreateTenantVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/CreateTenantVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/QueryTenantVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/QueryTenantVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/QueryTenantVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/QueryTenantVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/TenantSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/TenantSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/TenantSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/TenantSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/UpdateTenantVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/UpdateTenantVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/UpdateTenantVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/tenant/UpdateTenantVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java index d2d1934e8035067f688b24b47cd0c44c74eee1bc..7548b7006d45bea85da3ae0418d57e4365edb552 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/CreateSysUserVo.java @@ -5,7 +5,7 @@ import com.lframework.starter.web.components.validation.IsCode; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.components.validation.Pattern; import com.lframework.starter.web.vo.BaseVo; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; @@ -82,12 +82,6 @@ public class CreateSysUserVo implements BaseVo, Serializable { @ApiModelProperty("角色ID") private List roleIds; - /** - * 岗位ID - */ - @ApiModelProperty("岗位ID") - private List positionIds; - /** * 备注 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/ApproveRefuseStockCostAdjustSheetVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java similarity index 40% rename from xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/ApproveRefuseStockCostAdjustSheetVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java index 72f3c11c7afef9fdd862e46511db38d8731e4bf4..1926cbd8d6e37310bbfaf3cdbf19d7aa0d41513c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/stock/adjust/cost/ApproveRefuseStockCostAdjustSheetVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetLoginCaptchaRequieVo.java @@ -1,27 +1,30 @@ -package com.lframework.xingyun.sc.vo.stock.adjust.cost; +package com.lframework.xingyun.template.inner.vo.system.user; import com.lframework.starter.web.vo.BaseVo; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; import lombok.Data; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 用户登录请求参数 + */ @Data -public class ApproveRefuseStockCostAdjustSheetVo implements BaseVo, Serializable { +public class GetLoginCaptchaRequieVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; /** - * ID + * 租户名称 */ - @ApiModelProperty("ID") - @NotBlank(message = "id不能为空！") - private String id; + @ApiModelProperty("租户名称") + private String tenantName; /** - * 拒绝理由 + * 用户名 */ - @ApiModelProperty("拒绝理由") - @NotBlank(message = "拒绝理由不能为空！") - private String refuseReason; + @ApiModelProperty(value = "用户名", required = true) + @NotBlank(message = "用户名不能为空！") + private String username; } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetTelephoneLoginCaptchaVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetTelephoneLoginCaptchaVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetTelephoneLoginCaptchaVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/GetTelephoneLoginCaptchaVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java similarity index 90% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java index f39fea8ac1c3daadb3c5b7c0f4aaaef25f1a2f2d..91da48abf8e7576ab3a9e4eebcd6340e96c4e51e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/LoginVo.java @@ -14,6 +14,12 @@ public class LoginVo implements BaseVo, Serializable { private static final long serialVersionUID = 1L; + /** + * 租户名称 + */ + @ApiModelProperty("租户名称") + private String tenantName; + /** * 用户名 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java similarity index 91% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java index d99ade9205b9010ef92d35f3be90f9a19dec2f05..bbf1f1db6650c32e077164d05a37321849386ab2 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/QuerySysUserVo.java @@ -30,12 +30,6 @@ public class QuerySysUserVo extends SortPageVo implements BaseVo, Serializable { @ApiModelProperty("姓名") private String name; - /** - * 岗位ID - */ - @ApiModelProperty("岗位ID") - private String positionId; - /** * 部门ID */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/RegistUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/RegistUserVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/RegistUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/RegistUserVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserRoleSettingVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserRoleSettingVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserRoleSettingVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserRoleSettingVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserSelectorVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserSelectorVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserSelectorVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/SysUserSelectorVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneBindUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneBindUserVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneBindUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneBindUserVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneLoginVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneLoginVo.java similarity index 100% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneLoginVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/TelephoneLoginVo.java diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java similarity index 93% rename from xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java rename to xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java index 7a56a4737fb5188a5a6f13d695b67be01c29d083..fc51dc14b503bd30e5ebe04f381a509db40d5251 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java +++ b/xingyun-sys/src/main/java/com/lframework/xingyun/template/inner/vo/system/user/UpdateSysUserVo.java @@ -3,7 +3,7 @@ package com.lframework.xingyun.template.inner.vo.system.user; import com.lframework.starter.web.components.validation.IsCode; import com.lframework.starter.web.components.validation.IsEnum; import com.lframework.starter.web.vo.BaseVo; -import com.lframework.xingyun.template.core.enums.Gender; +import com.lframework.xingyun.core.enums.Gender; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.List; @@ -71,12 +71,6 @@ public class UpdateSysUserVo implements BaseVo, Serializable { @IsEnum(message = "请选择性别！", enumClass = Gender.class) private Integer gender; - /** - * 岗位ID - */ - @ApiModelProperty("岗位ID") - private List positionIds; - /** * 角色ID */ diff --git a/xingyun-template-core/src/main/java/lombok.config b/xingyun-sys/src/main/java/lombok.config similarity index 100% rename from xingyun-template-core/src/main/java/lombok.config rename to xingyun-sys/src/main/java/lombok.config diff --git a/xingyun-template/src/main/resources/mappers/QrtzMapper.xml b/xingyun-sys/src/main/resources/mappers/QrtzMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/QrtzMapper.xml rename to xingyun-sys/src/main/resources/mappers/QrtzMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/SysParameterMapper.xml b/xingyun-sys/src/main/resources/mappers/SysParameterMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/SysParameterMapper.xml rename to xingyun-sys/src/main/resources/mappers/SysParameterMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/TenantMapper.xml b/xingyun-sys/src/main/resources/mappers/TenantMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/TenantMapper.xml rename to xingyun-sys/src/main/resources/mappers/TenantMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/UserDetailsMapper.xml b/xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml similarity index 85% rename from xingyun-template/src/main/resources/mappers/UserDetailsMapper.xml rename to xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml index 673fd5752757fa29ff0fedea355827f8662e3f9a..b1eea9c45b27332a34be8cbe75d84747a7549d46 100644 --- a/xingyun-template/src/main/resources/mappers/UserDetailsMapper.xml +++ b/xingyun-sys/src/main/resources/mappers/UserDetailsMapper.xml @@ -2,7 +2,7 @@ - + @@ -13,7 +13,7 @@ - SELECT id, username, password, name, email, telephone, available, lock_status FROM sys_user WHERE username = #{username} diff --git a/xingyun-template/src/main/resources/mappers/gen/DBMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/DBMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/DBMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/DBMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCreateColumnConfigMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomListCategoryMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomListHandleColumnMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomListMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomListMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomListMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomListToolbarMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomPageCategoryMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomPageMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomPageMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomPageMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomPageMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorCategoryMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenCustomSelectorMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenDataEntityCategoryMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenDataEntityMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataEntityMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenDataEntityMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenDataEntityMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenDataObjDetailMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenDataObjMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDataObjMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenDataObjMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenDataObjMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenDetailColumnConfigMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenGenerateInfoMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenQueryColumnConfigMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenQueryParamsColumnConfigMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableColumnMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenSimpleTableMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenSimpleTableMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenSimpleTableMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml b/xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml rename to xingyun-sys/src/main/resources/mappers/gen/GenUpdateColumnConfigService.xml diff --git a/xingyun-template/src/main/resources/mappers/gen/SimpleDBMapper.xml b/xingyun-sys/src/main/resources/mappers/gen/SimpleDBMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/gen/SimpleDBMapper.xml rename to xingyun-sys/src/main/resources/mappers/gen/SimpleDBMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysDataDicCategoryMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysDataDicItemMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicItemMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysDataDicItemMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysDataDicItemMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysDataDicMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDataDicMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysDataDicMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysDataDicMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysDeptMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysDeptMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysDeptMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysDeptMapper.xml diff --git a/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..78ff42cc3b8fc41b309b6d9fe085a5e505d042e2 --- /dev/null +++ b/xingyun-sys/src/main/resources/mappers/system/SysGenerateCodeMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + SELECT + tb.id, + tb.name, + tb.config_str + FROM sys_generate_code AS tb + + diff --git a/xingyun-sys/src/main/resources/mappers/system/SysMailMessageMapper.xml.xml b/xingyun-sys/src/main/resources/mappers/system/SysMailMessageMapper.xml.xml new file mode 100644 index 0000000000000000000000000000000000000000..752dd611da13d04a23ece255b1a4d385ba9cb69b --- /dev/null +++ b/xingyun-sys/src/main/resources/mappers/system/SysMailMessageMapper.xml.xml @@ -0,0 +1,35 @@ + + + + + + SELECT + tb.* + FROM sys_mail_message tb + + + + diff --git a/xingyun-template/src/main/resources/mappers/system/SysMenuMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysMenuMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysMenuMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysMenuMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysNoticeLogMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNoticeLogMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysNoticeLogMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysNoticeLogMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysNoticeMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNoticeMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysNoticeMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysNoticeMapper.xml diff --git a/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..733d6caa0377897a955f3c4a90419fdaffaf2a16 --- /dev/null +++ b/xingyun-sys/src/main/resources/mappers/system/SysNotifyGroupMapper.xml @@ -0,0 +1,43 @@ + + + + + SELECT + tb.* + FROM sys_notify_group AS tb + + + + + diff --git a/xingyun-template/src/main/resources/mappers/system/SysOpenDomainMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysOpenDomainMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysOpenDomainMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysOpenDomainMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysRoleMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysRoleMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysRoleMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysRoleMapper.xml diff --git a/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..a66fd9345979b9096d0daf21dfb92d8ebe34368c --- /dev/null +++ b/xingyun-sys/src/main/resources/mappers/system/SysSiteMessageMapper.xml @@ -0,0 +1,56 @@ + + + + + + SELECT + tb.* + FROM sys_site_message tb + + + + + diff --git a/xingyun-template/src/main/resources/mappers/system/SysUserDeptMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserDeptMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysUserDeptMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysUserDeptMapper.xml diff --git a/xingyun-template/src/main/resources/mappers/system/SysUserMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml similarity index 91% rename from xingyun-template/src/main/resources/mappers/system/SysUserMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml index db635914aec6fc0597d68f9619e53e17c6f18ec7..35b0d75288cf746c3a6e81282cc44e67ecca0b1a 100644 --- a/xingyun-template/src/main/resources/mappers/system/SysUserMapper.xml +++ b/xingyun-sys/src/main/resources/mappers/system/SysUserMapper.xml @@ -8,16 +8,13 @@ FROM sys_user AS u - AND u.code = #{vo.code} - - AND u.id IN (SELECT user_id FROM sys_user_position WHERE position_id = #{vo.positionId}) - AND u.id IN (SELECT user_id FROM sys_user_dept WHERE dept_id = #{vo.deptId}) @@ -38,11 +35,11 @@ ORDER BY u.code - WHERE u.id = #{id} - diff --git a/xingyun-template/src/main/resources/mappers/system/SysUserRoleMapper.xml b/xingyun-sys/src/main/resources/mappers/system/SysUserRoleMapper.xml similarity index 100% rename from xingyun-template/src/main/resources/mappers/system/SysUserRoleMapper.xml rename to xingyun-sys/src/main/resources/mappers/system/SysUserRoleMapper.xml diff --git a/xingyun-template/src/main/resources/templates/add.vue.ftl b/xingyun-sys/src/main/resources/templates/add.vue.ftl similarity index 62% rename from xingyun-template/src/main/resources/templates/add.vue.ftl rename to xingyun-sys/src/main/resources/templates/add.vue.ftl index 4ec64609bc73e051fb2b1943d22d885173b61374..4fe8267770ffa27f467d4fcda1aa5ca296a06115 100644 --- a/xingyun-template/src/main/resources/templates/add.vue.ftl +++ b/xingyun-sys/src/main/resources/templates/add.vue.ftl @@ -1,12 +1,12 @@ diff --git a/xingyun-sys/src/main/resources/templates/api.ts.ftl b/xingyun-sys/src/main/resources/templates/api.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..417c881d5bacf26233a7293f9774d903f2d05c4f --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/api.ts.ftl @@ -0,0 +1,113 @@ +import { defHttp } from '/@/utils/http/axios'; +import { PageResult } from '@/api/model/pageResult'; +import { ContentTypeEnum } from '@/enums/httpEnum'; +<#if query??>import { Query${className}Vo } from '@/api/${moduleName}/${bizName}/model/query${className}Vo'; +<#if query??>import { Query${className}Bo } from '@/api/${moduleName}/${bizName}/model/query${className}Bo'; +<#if detail??>import { ${r"Get"}${className}${r"Bo"} } from '@/api/${moduleName}/${bizName}/model/${r"get"}${className}${r"Bo"}'; +<#if create??>import { Create${className}Vo } from '@/api/${moduleName}/${bizName}/model/create${className}Vo'; +<#if update??>import { Update${className}Vo } from '@/api/${moduleName}/${bizName}/model/update${className}Vo'; + +const baseUrl = '/${moduleName}/${bizName}'; +const region = 'cloud-api'; + +<#if query??> +/** + * 查询列表 + * @param params + * @returns {Promise} + */ +export function query(params: Query${className}Vo): ${r"Promise>"} { + return defHttp.get<${r"PageResult<"}Query${className}${r"Bo>"}>( + { + url: baseUrl + '/query', + params: params, + }, + { + region, + }, + ); +} + + +<#if detail??> +/** + * 根据ID查询 + * @param ${keys[0].name} + * @returns {Promise} + */ +export function get(${keys[0].name}: ${keys[0].dataType}): ${r"Promise"} { + return defHttp.get<${r"Get"}${className}${r"Bo"}>( + { + url: baseUrl, + params: { + ${keys[0].name}, + } + }, + { + region, + }, + ); +} + + +<#if create??> +/** + * 新增 + * @param params + * @returns {Promise} + */ +export function create(params: Create${className}Vo): ${r"Promise"} { + return defHttp.post( + { + url: baseUrl, + data: params, + }, + { + contentType: ContentTypeEnum.FORM_URLENCODED, + region, + }, + ); +} + + +<#if update??> +/** + * 修改 + * @param params + * @returns {Promise} + */ +export function update(params: Update${className}Vo): ${r"Promise"} { + return defHttp.put( + { + url: baseUrl, + data: params, + }, + { + contentType: ContentTypeEnum.FORM_URLENCODED, + region, + }, + ); +} + + +<#if hasDelete> +/** + * 删除 + * @param params + * @returns {Promise} + */ +export function deleteById(${keys[0].name}: ${keys[0].dataType}): ${r"Promise"} { + return defHttp.delete( + { + url: baseUrl, + data: { + ${keys[0].name}, + }, + }, + { + region, + contentType: ContentTypeEnum.FORM_URLENCODED, + }, + ); +} + \ No newline at end of file diff --git a/xingyun-template/src/main/resources/templates/controller.java.ftl b/xingyun-sys/src/main/resources/templates/controller.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/controller.java.ftl rename to xingyun-sys/src/main/resources/templates/controller.java.ftl diff --git a/xingyun-template/src/main/resources/templates/createvo.java.ftl b/xingyun-sys/src/main/resources/templates/createvo.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/createvo.java.ftl rename to xingyun-sys/src/main/resources/templates/createvo.java.ftl diff --git a/xingyun-sys/src/main/resources/templates/createvo.ts.ftl b/xingyun-sys/src/main/resources/templates/createvo.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..0ce281e2b26c880dbe1cbac731b4ddf6c720d1b8 --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/createvo.ts.ftl @@ -0,0 +1,10 @@ +export interface Create${className}Vo { + + <#list columns as column> + /** + * ${column.description} + */ + ${column.name}<#if !column.required>?: ${column.frontDataType}; + + +} diff --git a/xingyun-template/src/main/resources/templates/detail.vue.ftl b/xingyun-sys/src/main/resources/templates/detail.vue.ftl similarity index 67% rename from xingyun-template/src/main/resources/templates/detail.vue.ftl rename to xingyun-sys/src/main/resources/templates/detail.vue.ftl index f30a27bd5c9170121c639352ca139dd65d67e08f..2f6deadc7e6a68b02ac6825aaf833d5ff6c3e8be 100644 --- a/xingyun-template/src/main/resources/templates/detail.vue.ftl +++ b/xingyun-sys/src/main/resources/templates/detail.vue.ftl @@ -1,5 +1,5 @@ diff --git a/xingyun-template/src/main/resources/templates/entity.java.ftl b/xingyun-sys/src/main/resources/templates/entity.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/entity.java.ftl rename to xingyun-sys/src/main/resources/templates/entity.java.ftl diff --git a/xingyun-template/src/main/resources/templates/getbo.java.ftl b/xingyun-sys/src/main/resources/templates/getbo.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/getbo.java.ftl rename to xingyun-sys/src/main/resources/templates/getbo.java.ftl diff --git a/xingyun-sys/src/main/resources/templates/getbo.ts.ftl b/xingyun-sys/src/main/resources/templates/getbo.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..d4908caab6d95557159a92ecd75bcdf75a2be14a --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/getbo.ts.ftl @@ -0,0 +1,29 @@ +/** + * ${classDescription} GetBo + * +<#if author??> + * @author ${author} + + */ +export interface Get${className}Bo { + + /** + * ${keys[0].description} + */ + ${keys[0].name}: ${keys[0].frontDataType}; + + <#list columns as column> + /** + * ${column.description} + */ + ${column.name}: ${column.frontDataType}; + + <#if column.dataDicCode??> + /** + * ${column.description}字典值 + */ + ${column.name}DicValue: string; + + + +} diff --git a/xingyun-template/src/main/resources/templates/index.vue.ftl b/xingyun-sys/src/main/resources/templates/index.vue.ftl similarity index 40% rename from xingyun-template/src/main/resources/templates/index.vue.ftl rename to xingyun-sys/src/main/resources/templates/index.vue.ftl index cc68b49c74d75272c80cb77b1345bb4cfd093eb0..5a0451948858ececdbf5529f48ee19f7e93f6d07 100644 --- a/xingyun-template/src/main/resources/templates/index.vue.ftl +++ b/xingyun-sys/src/main/resources/templates/index.vue.ftl @@ -1,70 +1,73 @@ diff --git a/xingyun-template/src/main/resources/templates/input-components.ftl b/xingyun-sys/src/main/resources/templates/input-components.ftl similarity index 60% rename from xingyun-template/src/main/resources/templates/input-components.ftl rename to xingyun-sys/src/main/resources/templates/input-components.ftl index 6a1ac10ab7f0d0364e259863997ea336fd9d72ef..f0f49c0fc95cc054d9a098961aec45d3f1fe3468 100644 --- a/xingyun-template/src/main/resources/templates/input-components.ftl +++ b/xingyun-sys/src/main/resources/templates/input-components.ftl @@ -1,39 +1,39 @@ <#if column.viewType == 0> - max-length="${column.len}" allow-clear /> + max-length="${column.len}" allow-clear /> <#elseif column.viewType == 1> - max-length="${column.len}" allow-clear /> + max-length="${column.len}" allow-clear /> <#elseif column.viewType == 2> <#elseif column.viewType == 3> <#elseif column.viewType == 4> <#elseif column.viewType == 5> <#if column.fixEnum> - + {{ item.desc }} <#else> <#if column.hasAvailableTag> - + {{ item.desc }} <#else> - + 是 否 @@ -43,13 +43,13 @@ <#if column.dataType == 'LocalDateTime'>
至 @@ -57,14 +57,14 @@ <#else>
至 <#elseif column.viewType == 7> - + <#elseif column.viewType == 8> - + diff --git a/xingyun-template/src/main/resources/templates/mapper.java.ftl b/xingyun-sys/src/main/resources/templates/mapper.java.ftl similarity index 87% rename from xingyun-template/src/main/resources/templates/mapper.java.ftl rename to xingyun-sys/src/main/resources/templates/mapper.java.ftl index 9dd1beab60211a5fc6190ec40c0f49569bcaba5c..4a0f8d0f893b611708cb05270455a46f1b616934 100644 --- a/xingyun-template/src/main/resources/templates/mapper.java.ftl +++ b/xingyun-sys/src/main/resources/templates/mapper.java.ftl @@ -1,6 +1,11 @@ package ${packageName}.mappers; import ${packageName}.entity.${className}; +<#if importPackages??> + <#list importPackages as p> +import ${p}; + + <#if queryParams??> import ${packageName}.vo.${moduleName}.${bizName}.Query${className}Vo; diff --git a/xingyun-template/src/main/resources/templates/mapper.list.xml.ftl b/xingyun-sys/src/main/resources/templates/mapper.list.xml.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/mapper.list.xml.ftl rename to xingyun-sys/src/main/resources/templates/mapper.list.xml.ftl diff --git a/xingyun-template/src/main/resources/templates/modify.vue.ftl b/xingyun-sys/src/main/resources/templates/modify.vue.ftl similarity index 60% rename from xingyun-template/src/main/resources/templates/modify.vue.ftl rename to xingyun-sys/src/main/resources/templates/modify.vue.ftl index 5cd96306e53ed81cb3990975e030fecbad27d7a2..3bf5a73ff6f50ce1aa25b870096028e8509476a1 100644 --- a/xingyun-template/src/main/resources/templates/modify.vue.ftl +++ b/xingyun-sys/src/main/resources/templates/modify.vue.ftl @@ -1,12 +1,12 @@ diff --git a/xingyun-template/src/main/resources/templates/query-type-sql.ftl b/xingyun-sys/src/main/resources/templates/query-type-sql.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/query-type-sql.ftl rename to xingyun-sys/src/main/resources/templates/query-type-sql.ftl diff --git a/xingyun-template/src/main/resources/templates/querybo.java.ftl b/xingyun-sys/src/main/resources/templates/querybo.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/querybo.java.ftl rename to xingyun-sys/src/main/resources/templates/querybo.java.ftl diff --git a/xingyun-sys/src/main/resources/templates/querybo.ts.ftl b/xingyun-sys/src/main/resources/templates/querybo.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..6d2c4f692b444b424ae479e2baa46e43628ca5bb --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/querybo.ts.ftl @@ -0,0 +1,22 @@ +/** + * ${classDescription} QueryBo + * +<#if author??> + * @author ${author} + + */ +export interface Query${className}Bo { + + /** + * ${keys[0].description} + */ + ${keys[0].name}: ${keys[0].frontDataType}; + +<#list columns as column> + /** + * ${column.description} + */ + ${column.name}: ${column.frontDataType}; + + +} diff --git a/xingyun-template/src/main/resources/templates/queryvo.java.ftl b/xingyun-sys/src/main/resources/templates/queryvo.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/queryvo.java.ftl rename to xingyun-sys/src/main/resources/templates/queryvo.java.ftl diff --git a/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl b/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..c22936310aeea527cb0f897a7aa45d1f68f96c30 --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/queryvo.ts.ftl @@ -0,0 +1,25 @@ +import { PageVo } from '@/api/model/pageVo'; + +export interface Query${className}Vo extends PageVo { + + <#list columns as column> + <#if column.viewType != 6> + /** + * ${column.description} + */ + ${column.name}: ${column.frontDataType}; + + <#if column.viewType == 6> + /** + * ${column.description} 起始时间 + */ + ${column.name}Start: ${column.frontDataType}; + + /** + * ${column.description} 截止时间 + */ + ${column.name}End: ${column.frontDataType}; + + + +} diff --git a/xingyun-template/src/main/resources/templates/service.java.ftl b/xingyun-sys/src/main/resources/templates/service.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/service.java.ftl rename to xingyun-sys/src/main/resources/templates/service.java.ftl diff --git a/xingyun-template/src/main/resources/templates/serviceimpl.java.ftl b/xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl similarity index 94% rename from xingyun-template/src/main/resources/templates/serviceimpl.java.ftl rename to xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl index 4a1d11dc5d973628ff02d8d64bf2d3e3fd34752e..bd9483cb3cda16cf00d0f9cbce9326b5f5e4e99d 100644 --- a/xingyun-template/src/main/resources/templates/serviceimpl.java.ftl +++ b/xingyun-sys/src/main/resources/templates/serviceimpl.java.ftl @@ -65,7 +65,7 @@ public class ${className}ServiceImpl extends BaseMpServiceImpl${r"<"}${className } <#if create??> - @OpLog(type = OpLogType.OTHER, name = "新增${classDescription}，ID：{}", params = ${r'{"#'}${create.keys[0].name}${r'"}'}) + @OpLog(type = 99, name = "新增${classDescription}，ID：{}", params = ${r'{"#'}${create.keys[0].name}${r'"}'}) @Transactional(rollbackFor = Exception.class) @Override public ${create.keys[0].dataType} create(Create${className}Vo vo) { @@ -108,7 +108,7 @@ public class ${className}ServiceImpl extends BaseMpServiceImpl${r"<"}${className <#if update??> - @OpLog(type = OpLogType.OTHER, name = "修改${classDescription}，ID：{}", params = ${r'{"#'}${update.keys[0].name}${r'"}'}) + @OpLog(type = 99, name = "修改${classDescription}，ID：{}", params = ${r'{"#'}${update.keys[0].name}${r'"}'}) @Transactional(rollbackFor = Exception.class) @Override public void update(Update${className}Vo vo) { @@ -148,7 +148,7 @@ public class ${className}ServiceImpl extends BaseMpServiceImpl${r"<"}${className <#if hasDelete> - @OpLog(type = OpLogType.OTHER, name = "删除${classDescription}，ID：{}", params = ${r'{"#'}${keys[0].name}${r'"}'}) + @OpLog(type = 99, name = "删除${classDescription}，ID：{}", params = ${r'{"#'}${keys[0].name}${r'"}'}) @Transactional(rollbackFor = Exception.class) @Override public void deleteById(<#list keys as key>${key.dataType} ${key.name}<#if key_index != keys?size - 1>, ) { diff --git a/xingyun-template/src/main/resources/templates/sql.ftl b/xingyun-sys/src/main/resources/templates/sql.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/sql.ftl rename to xingyun-sys/src/main/resources/templates/sql.ftl diff --git a/xingyun-template/src/main/resources/templates/updatevo.java.ftl b/xingyun-sys/src/main/resources/templates/updatevo.java.ftl similarity index 100% rename from xingyun-template/src/main/resources/templates/updatevo.java.ftl rename to xingyun-sys/src/main/resources/templates/updatevo.java.ftl diff --git a/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl b/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl new file mode 100644 index 0000000000000000000000000000000000000000..747d111ab3c164f90d075e1dccc08d1c6003a095 --- /dev/null +++ b/xingyun-sys/src/main/resources/templates/updatevo.ts.ftl @@ -0,0 +1,17 @@ + +export interface Update${className}Vo { + + /** + * ${keys[0].description} + */ + ${keys[0].name}: ${keys[0].frontDataType}; + +<#list columns as column> + /** + * ${column.description} + */ + + ${column.name}<#if !column.required>?: ${column.frontDataType}; + + +} diff --git a/xingyun-template-core/pom.xml b/xingyun-template-core/pom.xml deleted file mode 100644 index 47320cb6851e3126f2713412976107d44fae707a..0000000000000000000000000000000000000000 --- a/xingyun-template-core/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - xingyun - com.lframework - 1.0.0-SNAPSHOT - - 4.0.0 - - xingyun-template-core - - 【${project.artifactId}】此Module与业务无关，提供业务Module与Template Module的交互能力 - - - - com.lframework - web-starter - - - \ No newline at end of file diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/DataPermissionHandlerImpl.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/DataPermissionHandlerImpl.java deleted file mode 100644 index 017918553e42cc2ff1f51c79694811bebbec435c..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/components/permission/DataPermissionHandlerImpl.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.lframework.xingyun.template.core.components.permission; - -import cn.dev33.satoken.exception.SaTokenException; -import cn.dev33.satoken.session.SaSession; -import cn.dev33.satoken.stp.StpUtil; -import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; -import com.lframework.starter.common.exceptions.impl.DefaultSysException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.common.security.SecurityConstants; -import com.lframework.starter.web.common.utils.ApplicationUtil; -import com.lframework.xingyun.template.core.annotations.permission.DataPermission; -import com.lframework.xingyun.template.core.annotations.permission.DataPermissions; -import com.lframework.xingyun.template.core.service.SysDataPermissionModelDetailService; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import net.sf.jsqlparser.JSQLParserException; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; - -public class DataPermissionHandlerImpl implements DataPermissionHandler { - - private static final String EMPTY_SQL = "(1 = 1)"; - - @Override - public Expression getSqlSegment(Expression where, String mappedStatementId) { - try { - String sqlSegment = this.convertDataPermissionSql(mappedStatementId); - if (StringUtil.isEmpty(sqlSegment)) { - return null; - } - Expression sqlSegmentExpression = CCJSqlParserUtil.parseCondExpression(sqlSegment); - if (null != where) { - return new AndExpression(where, sqlSegmentExpression); - } - return sqlSegmentExpression; - } catch (JSQLParserException e) { - e.printStackTrace(); - } - return null; - } - - private String getDataPermission(SysDataPermissionDataPermissionType permissionType, - List keys, - List values) { - - Map dataPermissionMap = null; - Map dataPermissionVar = null; - try { - SaSession session = StpUtil.getSession(false); - if (session == null) { - return EMPTY_SQL; - } - dataPermissionMap = (Map) session.get( - SecurityConstants.DATA_PERMISSION_SQL_MAP); - - dataPermissionVar = (Map) session.get( - SecurityConstants.DATA_PERMISSION_SQL_VAR); - if (CollectionUtil.isEmpty(dataPermissionMap)) { - return EMPTY_SQL; - } - } catch (SaTokenException e) { - return EMPTY_SQL; - } - - Assert.notNull(permissionType); - Assert.notNull(keys); - Assert.notNull(values); - - String sqlTemplate = dataPermissionMap.get(permissionType.getCode().toString()); - if (StringUtil.isBlank(sqlTemplate)) { - return EMPTY_SQL; - } - - if (keys.size() != values.size()) { - throw new DefaultSysException("keys和values长度不一致！"); - } - - Map sqlParams = new HashMap<>(); - for (int i = 0; i < keys.size(); i++) { - sqlParams.put(keys.get(i), values.get(i)); - } - - if (CollectionUtil.isNotEmpty(dataPermissionVar)) { - dataPermissionVar.forEach((k, v) -> { - sqlParams.put("__var#" + k, v); - }); - } - - SysDataPermissionModelDetailService sysDataPermissionModelDetailService = ApplicationUtil.getBean( - SysDataPermissionModelDetailService.class); - return sysDataPermissionModelDetailService.formatSql(sqlTemplate, sqlParams); - } - - private String convertDataPermissionSql(String statementId) { - // 获取Mapper执行方法上的注解 - Method mapperMethod = null; - try { - mapperMethod = this.findMapperMethod(this.convertMsId(statementId)); - } catch (ClassNotFoundException e) { - return null; - } - if (mapperMethod == null) { - return null; - } - DataPermissions dataPermissions = mapperMethod.getAnnotation(DataPermissions.class); - - if (dataPermissions != null) { - SysDataPermissionDataPermissionType dataPermissionType = dataPermissions.type(); - DataPermission[] dataPermissionList = dataPermissions.value(); - String dataPermissionSql = this.getDataPermission(dataPermissionType, - Arrays.stream(dataPermissionList).map(DataPermission::template) - .collect(Collectors.toList()), - Arrays.stream(dataPermissionList).map(DataPermission::alias) - .collect(Collectors.toList())); - - return dataPermissionSql; - } - - return null; - } - - private String convertMsId(String id) { - String pageHelperSuffix = "_COUNT"; - if (id.endsWith(pageHelperSuffix)) { - return id.substring(0, id.length() - pageHelperSuffix.length()); - } - - String mpSuffix = "_mpCount"; - if (id.endsWith(mpSuffix)) { - return id.substring(0, id.length() - mpSuffix.length()); - } - - return id; - } - - private Method findMapperMethod(String statementId) - throws ClassNotFoundException { - int lastDotIndex = statementId.lastIndexOf("."); - String className = statementId.substring(0, lastDotIndex); - String methodName = statementId.substring(lastDotIndex + 1); - - Class mapperInterface = Class.forName(className); - return Arrays.stream(mapperInterface.getDeclaredMethods()) - .filter(method -> method.getName().equals(methodName)) - .findFirst() - .orElse(null); - } -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/DeptServiceImpl.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/DeptServiceImpl.java deleted file mode 100644 index 460fb8a6b9227cef226e0469ba7e0d6cc28e3d23..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/DeptServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.lframework.xingyun.template.core.impl; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.dto.DeptDto; -import com.lframework.xingyun.template.core.mappers.DeptMapper; -import com.lframework.xingyun.template.core.service.DeptService; -import java.io.Serializable; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -/** - * @author zmj - */ -@Service -public class DeptServiceImpl implements DeptService { - - @Autowired - private DeptMapper deptMapper; - - @Cacheable(value = DeptDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public DeptDto findById(String id) { - - if (StringUtil.isBlank(id)) { - return null; - } - - return deptMapper.findById(id); - } - - @Override - public DeptDto findByCode(String code) { - return deptMapper.findByCode(code); - } - - @CacheEvict(value = {DeptDto.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/UserServiceImpl.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/UserServiceImpl.java deleted file mode 100644 index a2589bd9363dc67e5ae6cc642415ceb1d96a9e4a..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/impl/UserServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lframework.xingyun.template.core.impl; - -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.xingyun.template.core.mappers.UserMapper; -import com.lframework.xingyun.template.core.service.UserService; -import com.lframework.xingyun.template.core.dto.UserDto; -import java.io.Serializable; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -/** - * 默认用户Service实现 - * - * @author zmj - */ -@Service -public class UserServiceImpl implements UserService { - - @Autowired - private UserMapper userMapper; - - @Cacheable(value = UserDto.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public UserDto findById(String id) { - - if (StringUtil.isBlank(id)) { - return null; - } - - return userMapper.findById(id); - } - - @Override - public UserDto findByCode(String code) { - return userMapper.findByCode(code); - } - - @CacheEvict(value = {UserDto.CACHE_NAME}, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/DeptMapper.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/DeptMapper.java deleted file mode 100644 index 5050f09c326d0ddd48071cf6c71878bc2b2ee4e0..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/DeptMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lframework.xingyun.template.core.mappers; - -import com.lframework.xingyun.template.core.dto.DeptDto; - -/** - * @author zmj - */ -public interface DeptMapper { - - /** - * 根据ID查询 主要用于各个业务关联查询信息 - * - * @param id - * @return - */ - DeptDto findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - DeptDto findByCode(String code); -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/UserMapper.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/UserMapper.java deleted file mode 100644 index e8f2fc8e102ec0920d46ecf99dfdbdfc12696d32..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/mappers/UserMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.core.mappers; - -import com.lframework.xingyun.template.core.dto.UserDto; - -/** - * 默认UserMapper - * - * @author zmj - */ -public interface UserMapper { - - /** - * 根据ID查询 主要用于各个业务关联查询用户信息 - * - * @param id - * @return - */ - UserDto findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - UserDto findByCode(String code); -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/DeptService.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/DeptService.java deleted file mode 100644 index f33c5a1aad6ab01da8b15413e571d552210ff7fe..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/DeptService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lframework.xingyun.template.core.service; - -import com.lframework.starter.web.service.BaseService; -import com.lframework.xingyun.template.core.dto.DeptDto; - -/** - * 部门Service - * - * @author zmj - */ -public interface DeptService extends BaseService { - - /** - * 根据ID查询 主要用于各个业务关联查询信息 - * - * @param id - * @return - */ - DeptDto findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - DeptDto findByCode(String code); -} diff --git a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/UserService.java b/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/UserService.java deleted file mode 100644 index e009d30b7ff012d76bd7dbb1fd77d6e279daf835..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/java/com/lframework/xingyun/template/core/service/UserService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lframework.xingyun.template.core.service; - -import com.lframework.xingyun.template.core.dto.UserDto; -import com.lframework.starter.web.service.BaseService; - -/** - * 用户Service - * - * @author zmj - */ -public interface UserService extends BaseService { - - /** - * 根据ID查询 主要用于各个业务关联查询用户信息 - * - * @param id - * @return - */ - UserDto findById(String id); - - /** - * 根据编号查询 - * - * @param code - * @return - */ - UserDto findByCode(String code); -} diff --git a/xingyun-template-core/src/main/resources/mappers/DeptMapper.xml b/xingyun-template-core/src/main/resources/mappers/DeptMapper.xml deleted file mode 100644 index 2d30636a4775674221c3e81a877152fe774092f6..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/resources/mappers/DeptMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/xingyun-template-core/src/main/resources/mappers/UserMapper.xml b/xingyun-template-core/src/main/resources/mappers/UserMapper.xml deleted file mode 100644 index 04c331f5a7fac49209b64a196a001a837a15ba9d..0000000000000000000000000000000000000000 --- a/xingyun-template-core/src/main/resources/mappers/UserMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/GetSysPositionBo.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/GetSysPositionBo.java deleted file mode 100644 index 14c1f2ae11cb2bbf08dc8b16b0866c723b51db26..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/bo/system/position/GetSysPositionBo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lframework.xingyun.template.inner.bo.system.position; - -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.starter.web.bo.BaseBo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class GetSysPositionBo extends BaseBo { - - /** - * ID - */ - @ApiModelProperty("ID") - private String id; - - /** - * 岗位编号 - */ - @ApiModelProperty("岗位编号") - private String code; - - /** - * 岗位名称 - */ - @ApiModelProperty("岗位名称") - private String name; - - /** - * 状态 - */ - @ApiModelProperty("状态") - private Boolean available; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; - - public GetSysPositionBo() { - - } - - public GetSysPositionBo(SysPosition dto) { - - super(dto); - } - - @Override - protected void afterInit(SysPosition dto) { - - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/LogoutEvent.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/LogoutEvent.java deleted file mode 100644 index 5024d49f8ee67644dd1c5a2bfec818d3abd71cc1..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/LogoutEvent.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.lframework.xingyun.template.inner.events; - -import com.lframework.starter.web.common.security.AbstractUserDetails; -import org.springframework.context.ApplicationEvent; - -/** - * 用户退出登录事件 - * - * @author zmj - */ -public class LogoutEvent extends ApplicationEvent { - - private final AbstractUserDetails user; - - private final String token; - - public LogoutEvent(Object source, AbstractUserDetails user, String token) { - - super(source); - this.user = user; - this.token = token; - } - - public AbstractUserDetails getUser() { - - return user; - } - - public String getToken() { - - return token; - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/UpdateUserEvent.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/UpdateUserEvent.java deleted file mode 100644 index 646a1a92d26dad5f65f1a93652ee62fd1fc74cd7..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/events/UpdateUserEvent.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.lframework.xingyun.template.inner.events; - -import org.springframework.context.ApplicationEvent; - -/** - * 修改用户事件 - * - * @author zmj - */ -public class UpdateUserEvent extends ApplicationEvent { - - /** - * 用户ID - */ - private String id; - - public UpdateUserEvent(Object source, String id) { - - super(source); - this.id = id; - } - - public String getId() { - - return id; - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysPositionServiceImpl.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysPositionServiceImpl.java deleted file mode 100644 index 592761973042dfc74bfde4f6d8bed03a58b0cee9..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysPositionServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.lframework.xingyun.template.inner.impl.system; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageInfo; -import com.lframework.starter.common.constants.StringPool; -import com.lframework.starter.common.exceptions.impl.DefaultClientException; -import com.lframework.starter.common.utils.Assert; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.common.utils.ObjectUtil; -import com.lframework.starter.common.utils.StringUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.utils.PageHelperUtil; -import com.lframework.starter.web.utils.PageResultUtil; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.xingyun.template.inner.vo.system.position.CreateSysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.QuerySysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.SysPositionSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.position.UpdateSysPositionVo; -import com.lframework.xingyun.template.inner.mappers.system.SysPositionMapper; -import com.lframework.xingyun.template.inner.service.system.SysPositionService; -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysPositionServiceImpl extends - BaseMpServiceImpl implements SysPositionService { - - @Override - public PageResult query(Integer pageIndex, Integer pageSize, - QuerySysPositionVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = this.doQuery(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @Cacheable(value = SysPosition.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null") - @Override - public SysPosition findById(String id) { - - return this.doGetById(id); - } - - @Override - public PageResult selector(Integer pageIndex, Integer pageSize, - SysPositionSelectorVo vo) { - - Assert.greaterThanZero(pageIndex); - Assert.greaterThanZero(pageSize); - - PageHelperUtil.startPage(pageIndex, pageSize); - - List datas = this.doSelector(vo); - - return PageResultUtil.convert(new PageInfo<>(datas)); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "停用岗位，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - this.doBatchUnable(ids); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "启用岗位，ID：{}", params = "#ids", loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void batchEnable(Collection ids) { - - if (CollectionUtil.isEmpty(ids)) { - return; - } - - this.doBatchEnable(ids); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "新增岗位，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public String create(CreateSysPositionVo vo) { - - SysPosition data = this.doCreate(vo); - - OpLogUtil.setVariable("id", data.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - - return data.getId(); - } - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "修改岗位，ID：{}, 编号：{}", params = {"#id", "#code"}) - @Transactional(rollbackFor = Exception.class) - @Override - public void update(UpdateSysPositionVo vo) { - - this.doUpdate(vo); - - OpLogUtil.setVariable("id", vo.getId()); - OpLogUtil.setVariable("code", vo.getCode()); - OpLogUtil.setExtra(vo); - } - - protected List doQuery(QuerySysPositionVo vo) { - - return getBaseMapper().query(vo); - } - - protected SysPosition doGetById(String id) { - - return getBaseMapper().findById(id); - } - - protected List doSelector(SysPositionSelectorVo vo) { - - return getBaseMapper().selector(vo); - } - - protected void doBatchUnable(Collection ids) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysPosition.class) - .set(SysPosition::getAvailable, Boolean.FALSE).in(SysPosition::getId, ids); - getBaseMapper().update(updateWrapper); - } - - protected void doBatchEnable(Collection ids) { - - Wrapper updateWrapper = Wrappers.lambdaUpdate(SysPosition.class) - .set(SysPosition::getAvailable, Boolean.TRUE).in(SysPosition::getId, ids); - getBaseMapper().update(updateWrapper); - } - - protected SysPosition doCreate(CreateSysPositionVo vo) { - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysPosition.class) - .eq(SysPosition::getCode, vo.getCode()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysPosition.class) - .eq(SysPosition::getName, vo.getName()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - SysPosition data = new SysPosition(); - data.setId(IdUtil.getId()); - data.setCode(vo.getCode()); - data.setName(vo.getName()); - - data.setAvailable(Boolean.TRUE); - data.setDescription( - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()); - - getBaseMapper().insert(data); - - return data; - } - - protected void doUpdate(UpdateSysPositionVo vo) { - - SysPosition data = this.findById(vo.getId()); - if (ObjectUtil.isNull(data)) { - throw new DefaultClientException("岗位不存在！"); - } - - Wrapper checkWrapper = Wrappers.lambdaQuery(SysPosition.class) - .eq(SysPosition::getCode, vo.getCode()).ne(SysPosition::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("编号重复，请重新输入！"); - } - - checkWrapper = Wrappers.lambdaQuery(SysPosition.class) - .eq(SysPosition::getName, vo.getName()) - .ne(SysPosition::getId, vo.getId()); - if (getBaseMapper().selectCount(checkWrapper) > 0) { - throw new DefaultClientException("名称重复，请重新输入！"); - } - - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate( - SysPosition.class) - .set(SysPosition::getCode, vo.getCode()) - .set(SysPosition::getName, vo.getName()) - .set(SysPosition::getAvailable, vo.getAvailable()) - .set(SysPosition::getDescription, - StringUtil.isBlank(vo.getDescription()) ? StringPool.EMPTY_STR : vo.getDescription()) - .eq(SysPosition::getId, vo.getId()); - - getBaseMapper().update(updateWrapper); - } - - @CacheEvict(value = SysPosition.CACHE_NAME, key = "@cacheVariables.tenantId() + #key") - @Override - public void cleanCacheByKey(Serializable key) { - - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserPositionServiceImpl.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserPositionServiceImpl.java deleted file mode 100644 index 5e22c4cdeef07c4d6dbf8956e56ceca0d3d6d4cf..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/impl/system/SysUserPositionServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.lframework.xingyun.template.inner.impl.system; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.lframework.starter.common.utils.CollectionUtil; -import com.lframework.starter.web.impl.BaseMpServiceImpl; -import com.lframework.starter.web.utils.IdUtil; -import com.lframework.xingyun.template.core.annotations.OpLog; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.inner.vo.system.position.SysUserPositionSettingVo; -import com.lframework.xingyun.template.inner.mappers.system.SysUserPositionMapper; -import com.lframework.xingyun.template.inner.entity.SysUserPosition; -import com.lframework.xingyun.template.inner.service.system.SysUserPositionService; -import java.util.List; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class SysUserPositionServiceImpl - extends BaseMpServiceImpl - implements SysUserPositionService { - - @OpLog(type = DefaultOpLogType.SYSTEM, name = "用户设置岗位，用户ID：{}，岗位ID：{}", params = {"#vo.userId", - "#vo.positionIds"}, loopFormat = true) - @Transactional(rollbackFor = Exception.class) - @Override - public void setting(SysUserPositionSettingVo vo) { - - this.doSetting(vo); - } - - @Override - public List getByUserId(String userId) { - - return doGetByUserId(userId); - } - - protected void doSetting(SysUserPositionSettingVo vo) { - - Wrapper deleteWrapper = Wrappers.lambdaQuery( - SysUserPosition.class) - .eq(SysUserPosition::getUserId, vo.getUserId()); - getBaseMapper().delete(deleteWrapper); - - if (!CollectionUtil.isEmpty(vo.getPositionIds())) { - for (String positionId : vo.getPositionIds()) { - SysUserPosition record = new SysUserPosition(); - record.setId(IdUtil.getId()); - record.setUserId(vo.getUserId()); - record.setPositionId(positionId); - - getBaseMapper().insert(record); - } - } - } - - protected List doGetByUserId(String userId) { - - return getBaseMapper().getByUserId(userId); - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LoginListener.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LoginListener.java deleted file mode 100644 index ab436dd82df9c2689e76894cb2f84cc5b953eed4..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LoginListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lframework.xingyun.template.inner.listeners; - -import com.lframework.starter.web.common.security.AbstractUserDetails; -import com.lframework.starter.web.common.security.SecurityUtil; -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.xingyun.template.inner.events.LoginEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -@Component -public class LoginListener implements ApplicationListener { - - @Override - public void onApplicationEvent(LoginEvent loginEvent) { - - AbstractUserDetails currentUser = SecurityUtil.getCurrentUser(); - CreateOpLogsVo vo = new CreateOpLogsVo(); - vo.setName("用户登录"); - vo.setLogType(DefaultOpLogType.AUTH); - vo.setCreateBy(currentUser.getName()); - vo.setCreateById(currentUser.getId()); - vo.setIp(currentUser.getIp()); - - OpLogUtil.addLog(vo); - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LogoutListener.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LogoutListener.java deleted file mode 100644 index 91f606576e62ae529780ab70c2577e730357329e..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/listeners/LogoutListener.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.lframework.xingyun.template.inner.listeners; - -import com.lframework.xingyun.template.core.enums.DefaultOpLogType; -import com.lframework.xingyun.template.core.utils.OpLogUtil; -import com.lframework.xingyun.template.core.vo.CreateOpLogsVo; -import com.lframework.xingyun.template.inner.events.LogoutEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -@Component -public class LogoutListener implements ApplicationListener { - - @Override - public void onApplicationEvent(LogoutEvent event) { - - CreateOpLogsVo vo = new CreateOpLogsVo(); - vo.setName("退出登录"); - vo.setLogType(DefaultOpLogType.AUTH); - vo.setCreateBy(event.getUser().getName()); - vo.setCreateById(event.getUser().getId()); - vo.setIp(event.getUser().getIp()); - - OpLogUtil.addLog(vo); - } -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysPositionMapper.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysPositionMapper.java deleted file mode 100644 index 1459e5adf26ba6573546e2d8dad97ef42c1c63d5..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/mappers/system/SysPositionMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lframework.xingyun.template.inner.mappers.system; - -import com.lframework.xingyun.template.core.annotations.sort.Sort; -import com.lframework.xingyun.template.core.annotations.sort.Sorts; -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.starter.web.mapper.BaseMapper; -import com.lframework.xingyun.template.inner.vo.system.position.QuerySysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.SysPositionSelectorVo; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -/** - *

- * 系统岗位 Mapper 接口 - *

- * - * @author zmj - * @since 2021-06-30 - */ -public interface SysPositionMapper extends BaseMapper { - - /** - * 查询列表 - * - * @param vo - * @return - */ - @Sorts({ - @Sort(value = "code", autoParse = true), - @Sort(value = "name", autoParse = true), - @Sort(value = "createTime", autoParse = true), - @Sort(value = "updateTime", autoParse = true), - }) - List query(@Param("vo") QuerySysPositionVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysPosition findById(String id); - - /** - * 选择器 - * - * @param vo - * @return - */ - List selector(@Param("vo") SysPositionSelectorVo vo); - -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysPositionService.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysPositionService.java deleted file mode 100644 index 20bfb6a8b37996a8ecac72250351ccc6df6e9ff5..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysPositionService.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysPosition; -import com.lframework.starter.web.resp.PageResult; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.position.CreateSysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.QuerySysPositionVo; -import com.lframework.xingyun.template.inner.vo.system.position.SysPositionSelectorVo; -import com.lframework.xingyun.template.inner.vo.system.position.UpdateSysPositionVo; -import java.util.Collection; - -public interface SysPositionService extends BaseMpService { - - /** - * 查询全部岗位信息 - * - * @return - */ - PageResult query(Integer pageIndex, Integer pageSize, - QuerySysPositionVo vo); - - /** - * 根据ID查询 - * - * @param id - * @return - */ - SysPosition findById(String id); - - /** - * 选择器 - * - * @return - */ - PageResult selector(Integer pageIndex, Integer pageSize, - SysPositionSelectorVo vo); - - /** - * 根据ID停用 - * - * @param ids - */ - void batchUnable(Collection ids); - - /** - * 根据ID启用 - * - * @param ids - */ - void batchEnable(Collection ids); - - /** - * 创建 - * - * @param vo - * @return - */ - String create(CreateSysPositionVo vo); - - /** - * 修改 - * - * @param vo - */ - void update(UpdateSysPositionVo vo); -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserPositionService.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserPositionService.java deleted file mode 100644 index c3d3cc1ab758c1f0d5f94d14d876d5bf3156c855..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/service/system/SysUserPositionService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.service.system; - -import com.lframework.xingyun.template.inner.entity.SysUserPosition; -import com.lframework.starter.web.service.BaseMpService; -import com.lframework.xingyun.template.inner.vo.system.position.SysUserPositionSettingVo; -import java.util.List; - -public interface SysUserPositionService extends BaseMpService { - - /** - * 设置岗位 - * - * @param vo - */ - void setting(SysUserPositionSettingVo vo); - - /** - * 根据用户ID查询 - * - * @param userId - * @return - */ - List getByUserId(String userId); -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/CreateSysPositionVo.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/CreateSysPositionVo.java deleted file mode 100644 index c7972ce2b9d0293429543c66cd52e8a602d3983e..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/CreateSysPositionVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.position; - -import com.lframework.starter.web.components.validation.IsCode; -import com.lframework.starter.web.vo.BaseVo; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -@Data -public class CreateSysPositionVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 岗位编号 - */ - @ApiModelProperty(value = "岗位编号", required = true) - @IsCode - @NotBlank(message = "请输入编号！") - private String code; - - /** - * 岗位名称 - */ - @ApiModelProperty(value = "岗位名称", required = true) - @NotBlank(message = "请输入名称！") - private String name; - - /** - * 备注 - */ - @ApiModelProperty("备注") - private String description; -} diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysUserPositionSettingVo.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysUserPositionSettingVo.java deleted file mode 100644 index 49fc9c01a4aad72253eadb7e236750c1d9a827f2..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/inner/vo/system/position/SysUserPositionSettingVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lframework.xingyun.template.inner.vo.system.position; - -import com.lframework.starter.web.vo.BaseVo; -import java.io.Serializable; -import java.util.List; -import javax.validation.constraints.NotBlank; -import lombok.Data; - -@Data -public class SysUserPositionSettingVo implements BaseVo, Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @NotBlank(message = "用户ID不能为空！") - private String userId; - - /** - * 岗位ID - */ - private List positionIds; -} diff --git a/xingyun-template/src/main/java/lombok.config b/xingyun-template/src/main/java/lombok.config deleted file mode 100644 index 8e37527a927dbd888d6f94d30ffd32395bb97676..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/java/lombok.config +++ /dev/null @@ -1,2 +0,0 @@ -config.stopBubbling=true -lombok.equalsAndHashCode.callSuper=call \ No newline at end of file diff --git a/xingyun-template/src/main/resources/mappers/system/SysPositionMapper.xml b/xingyun-template/src/main/resources/mappers/system/SysPositionMapper.xml deleted file mode 100644 index 9b2ec6688a862860ef278fe7d948a09329425d71..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/resources/mappers/system/SysPositionMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - SELECT - * - FROM sys_position - - - - - diff --git a/xingyun-template/src/main/resources/mappers/system/SysUserPositionMapper.xml b/xingyun-template/src/main/resources/mappers/system/SysUserPositionMapper.xml deleted file mode 100644 index 1d130fe8fbbeed6377c337591db23fe4266365d0..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/resources/mappers/system/SysUserPositionMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - SELECT - up.* - FROM sys_user_position AS up - INNER JOIN sys_position AS p ON p.id = up.position_id - - - diff --git a/xingyun-template/src/main/resources/templates/api.js.ftl b/xingyun-template/src/main/resources/templates/api.js.ftl deleted file mode 100644 index 2cf1ba7f7f41f52b485e2d001fff5afb2a19e283..0000000000000000000000000000000000000000 --- a/xingyun-template/src/main/resources/templates/api.js.ftl +++ /dev/null @@ -1,83 +0,0 @@ -import { request } from '@/utils/request' - -export default { - -<#if query??> - /** - * 查询列表 - * @param params - * @returns {AxiosPromise} - */ - query: (params) => { - return request({ - url: '/${moduleName}/${bizName}/query', - method: 'get', - params: params - }) - }, - - -<#if detail??> - /** - * 根据ID查询 - * @param ${keys[0].name} - * @returns {AxiosPromise} - */ - get: (${keys[0].name}) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'get', - params: { - ${keys[0].name}: ${keys[0].name} - } - }) - }, - - -<#if create??> - /** - * 新增 - * @param params - * @returns {AxiosPromise} - */ - create: (params) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'post', - data: params - }) - }, - - -<#if update??> - /** - * 修改 - * @param params - * @returns {AxiosPromise} - */ - modify: (params) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'put', - data: params - }) - }, - - -<#if hasDelete> - /** - * 删除 - * @param params - * @returns {AxiosPromise} - */ - deleteById: (${keys[0].name}) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'delete', - data: { - ${keys[0].name}: ${keys[0].name} - } - }) - }, - -} \ No newline at end of file